unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
From: Leo Prikler <leo.prikler@student.tugraz.at>
To: 23874@debbugs.gnu.org
Subject: bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions.
Date: Wed,  2 Dec 2020 14:22:43 +0100	[thread overview]
Message-ID: <20201202132244.30694-1-leo.prikler@student.tugraz.at> (raw)
In-Reply-To: <idjy45mvkuq.fsf@bimsb-sys02.mdc-berlin.net>

* guix/profiles.scm (manifest-transaction-effects): Delete duplicates in
install and remove.  Let multiple upgrades and downgrades shadow previous
transactions of the same kind.
---
 guix/profiles.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 1b15257210..99b7dbf299 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -724,8 +724,11 @@ replace it."
     (match input
       (()
        (let ((remove (manifest-transaction-remove transaction)))
-         (values (manifest-matching-entries manifest remove)
-                 (reverse install) (reverse upgrade) (reverse downgrade))))
+         (values (delete-duplicates
+                  (manifest-matching-entries manifest remove)
+                  manifest-entry=?)
+                 (delete-duplicates (reverse install) manifest-entry=?)
+                 (reverse upgrade) (reverse downgrade))))
       ((entry rest ...)
        ;; Check whether installing ENTRY corresponds to the installation of a
        ;; new package or to an upgrade.
@@ -740,10 +743,10 @@ replace it."
          (loop rest
                (if previous install (cons entry install))
                (if (and previous newer?)
-                   (alist-cons previous entry upgrade)
+                   (assoc-set! upgrade previous entry)
                    upgrade)
                (if (and previous (not newer?))
-                   (alist-cons previous entry downgrade)
+                   (assoc-set! downgrade previous entry)
                    downgrade)))))))
 
 (define (manifest-perform-transaction manifest transaction)
-- 
2.29.2





  parent reply	other threads:[~2020-12-02 13:24 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-30 13:59 bug#23874: duplicates in manifests are “installed” more than once Ricardo Wurmus
2016-06-30 21:14 ` Ludovic Courtès
2020-09-14 18:15   ` zimoun
2020-12-02 13:22 ` Leo Prikler [this message]
2020-12-02 13:22   ` bug#23874: [PATCH 2/2] profiles: Delete duplicate manifest entries in packages->manifest Leo Prikler
2020-12-02 20:26   ` bug#23874: [PATCH 1/2] profiles: Remove duplicates in manifest transactions Mark H Weaver
2020-12-02 22:25     ` Leo Prikler
2020-12-02 23:24       ` zimoun
2020-12-05 15:38       ` Ludovic Courtès
2020-12-05 16:29         ` Leo Prikler
2020-12-07  9:16           ` Ludovic Courtès
2020-12-07 15:28             ` zimoun
2020-12-02 23:39 ` bug#23874: [PATCH v2 " Leo Prikler
2020-12-02 23:39   ` bug#23874: [PATCH v2 2/2] profiles: Delete duplicate manifest entries in packages->manifest Leo Prikler
2020-12-05 16:20 ` bug#23874: [PATCH v3 1/2] profiles: Remove duplicates in manifest transactions Leo Prikler
2020-12-05 16:20   ` bug#23874: [PATCH v3 2/2] profiles: Delete duplicate manifest entries in packages->manifest Leo Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201202132244.30694-1-leo.prikler@student.tugraz.at \
    --to=leo.prikler@student.tugraz.at \
    --cc=23874@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).