nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

guix-package: Gracefully handle multiple installs of the same path. 

* guix-package.in (guix-package)[process-actions]: Compute PACKAGES such
  that packages listed in INSTALL* are first removed from the remainder
  of the list.  When PROF is equal to the previous profile's store path,
  do nothing.  Reported by Andreas Enge <andreas@enge.fr>.
* tests/guix-package.sh: Test the behavior of installing the same store
  path twice.  When removing a package, omit its version number.
This commit is contained in:
Ludovic Courtès 2012-12-12 00:01:17 +01:00
parent a09ec3a5af
commit 1c67d639d5
2 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
guix-package.in
View File

@ -359,10 +359,15 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
(_ #f)) (_ #f))
opts)) opts))
(packages (append install* (packages (append install*
(fold alist-delete (fold (lambda (package result)
(manifest-packages (match package
(profile-manifest profile)) ((name _ ...)
remove)))) (alist-delete name result))))
(fold alist-delete
(manifest-packages
(profile-manifest profile))
remove)
install*))))
(show-what-to-build drv dry-run?) (show-what-to-build drv dry-run?)
@ -370,16 +375,22 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
(and (build-derivations %store drv) (and (build-derivations %store drv)
(let* ((prof-drv (profile-derivation %store packages)) (let* ((prof-drv (profile-derivation %store packages))
(prof (derivation-path->output-path prof-drv)) (prof (derivation-path->output-path prof-drv))
(old-drv (profile-derivation
%store (manifest-packages
(profile-manifest profile))))
(old-prof (derivation-path->output-path old-drv))
(number (latest-profile-number profile)) (number (latest-profile-number profile))
(name (format #f "~a/~a-~a-link" (name (format #f "~a/~a-~a-link"
(dirname profile) (dirname profile)
(basename profile) (+ 1 number)))) (basename profile) (+ 1 number))))
(and (build-derivations %store (list prof-drv)) (if (string=? old-prof prof)
(begin (format (current-error-port) (_ "nothing to be done~%"))
(symlink prof name) (and (build-derivations %store (list prof-drv))
(when (file-exists? profile) (begin
(delete-file profile)) (symlink prof name)
(symlink name profile)))))))) (when (file-exists? profile)
(delete-file profile))
(symlink name profile)))))))))
(define (process-query opts) (define (process-query opts)
;; Process any query specified by OPTS. Return #t when a query was ;; Process any query specified by OPTS. Return #t when a query was

8
tests/guix-package.sh
View File

@ -30,6 +30,12 @@ guix-package -b -p "$profile" \
test -L "$profile" && test -L "$profile-1-link" test -L "$profile" && test -L "$profile-1-link"
test -f "$profile/bin/guile" test -f "$profile/bin/guile"
# Installing the same package a second time does nothing.
guix-package -b -p "$profile" \
-i `guix-build -e '(@@ (distro packages base) %bootstrap-guile)'`
test -L "$profile" && test -L "$profile-1-link"
! test -f "$profile-2-link"
test -f "$profile/bin/guile"
guix-package -b -p "$profile" \ guix-package -b -p "$profile" \
-i `guix-build -e '(@@ (distro packages base) gnu-make-boot0)'` -i `guix-build -e '(@@ (distro packages base) gnu-make-boot0)'`
@ -53,7 +59,7 @@ esac
test "`guix-package -p "$profile" -I 'g.*e' | cut -f1`" = "guile-bootstrap" test "`guix-package -p "$profile" -I 'g.*e' | cut -f1`" = "guile-bootstrap"
# Remove a package. # Remove a package.
guix-package -b -p "$profile" -r "guile-bootstrap-2.0" guix-package -b -p "$profile" -r "guile-bootstrap"
test -L "$profile-3-link" test -L "$profile-3-link"
test -f "$profile/bin/make" && ! test -f "$profile/bin/guile" test -f "$profile/bin/make" && ! test -f "$profile/bin/guile"