mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
profiles: 'manifest-add' truly deletes duplicate entries.
Fixes <https://bugs.gnu.org/30569>. Reported by Andreas Enge <andreas@enge.fr>. * guix/profiles.scm (manifest-add): Don't append ENTRIES as is. Instead, cons each element of ENTRIES as we fold over it. Remove unneeded ellispes in 'match' patterns.
This commit is contained in:
parent
acb59d99db
commit
435603a1d6
2 changed files with 16 additions and 11 deletions
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
|
||||
;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
|
||||
|
@ -494,19 +494,19 @@ (define (manifest-add manifest entries)
|
|||
Remove MANIFEST entries that have the same name and output as ENTRIES."
|
||||
(define (same-entry? entry name output)
|
||||
(match entry
|
||||
(($ <manifest-entry> entry-name _ entry-output _ ...)
|
||||
(($ <manifest-entry> entry-name _ entry-output _)
|
||||
(and (equal? name entry-name)
|
||||
(equal? output entry-output)))))
|
||||
|
||||
(make-manifest
|
||||
(append entries
|
||||
(fold (lambda (entry result)
|
||||
(match entry
|
||||
(($ <manifest-entry> name _ out _ ...)
|
||||
(filter (negate (cut same-entry? <> name out))
|
||||
result))))
|
||||
(manifest-entries manifest)
|
||||
entries))))
|
||||
(fold (lambda (entry result) ;XXX: quadratic
|
||||
(match entry
|
||||
(($ <manifest-entry> name _ out _)
|
||||
(cons entry
|
||||
(remove (cut same-entry? <> name out)
|
||||
result)))))
|
||||
(manifest-entries manifest)
|
||||
entries)))
|
||||
|
||||
(define (manifest-lookup manifest pattern)
|
||||
"Return the first item of MANIFEST that matches PATTERN, or #f if there is
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Alex Kost <alezost@gmail.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
@ -148,6 +148,11 @@ (define glibc
|
|||
(_ #f))
|
||||
(equal? m3 m4))))
|
||||
|
||||
(test-equal "manifest-add removes duplicates" ;<https://bugs.gnu.org/30569>
|
||||
(list guile-2.0.9)
|
||||
(manifest-entries (manifest-add (manifest '())
|
||||
(list guile-2.0.9 guile-2.0.9))))
|
||||
|
||||
(test-assert "manifest-perform-transaction"
|
||||
(let* ((m0 (manifest (list guile-2.0.9 guile-2.0.9:debug)))
|
||||
(t1 (manifest-transaction
|
||||
|
|
Loading…
Reference in a new issue