futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guix package: Never remove the current generation and warn about it.

Browse Source 
Fixes <http://bugs.gnu.org/19978>.
Reported by taylanbayirli@gmail.com (Taylan Ulrich Bayırlı/Kammer).

* guix/scripts/package.scm (delete-matching-generations): Warn when
  CURRENT is in NUMBERS, and always remove it before calling
  'delete-generations'.
* tests/guix-package.sh: Add --switch-generation=2 invocation before
  --delete-generations=3 invocation.
  Add --delete-generations=1.. test case.
This commit is contained in:
Ludovic Courtès 2015-04-06 21:26:12 +02:00
parent 381ac93b5e
commit d26eb84d14
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/scripts/package.scm
View File

@ -254,9 +254,16 @@ denote ranges as interpreted by 'matching-derivations'."
#:duration-relation >) #:duration-relation >)
=> =>
(lambda (numbers) (lambda (numbers)
(if (null-list? numbers) (when (memv current numbers)
(exit 1) (warning (_ "not removing generation ~a, which is current~%")
(delete-generations (%store) profile numbers)))) current))
;; Make sure we don't inadvertently remove the current
;; generation.
(let ((numbers (delv current numbers)))
(if (null-list? numbers)
(exit 1)
(delete-generations (%store) profile numbers)))))
(else (else
(leave (_ "invalid syntax: ~a~%") pattern))))) (leave (_ "invalid syntax: ~a~%") pattern)))))

11
tests/guix-package.sh
View File

@ -161,6 +161,9 @@ then
guix package --bootstrap -p "$profile" -i guile-bootstrap -i gcc-bootstrap guix package --bootstrap -p "$profile" -i guile-bootstrap -i gcc-bootstrap
guix package --search-paths -p "$profile" | grep LIBRARY_PATH guix package --search-paths -p "$profile" | grep LIBRARY_PATH
# Roll back so we can delete #3 below.
guix package -p "$profile" --switch-generation=2
# Delete the third generation and check that it was actually deleted. # Delete the third generation and check that it was actually deleted.
guix package -p "$profile" --delete-generations=3 guix package -p "$profile" --delete-generations=3
test -z "`guix package -p "$profile" -l 3`" test -z "`guix package -p "$profile" -l 3`"
@ -212,6 +215,14 @@ if guix package -p "$profile" --delete-generations=12m;
then false; else true; fi then false; else true; fi
test "`readlink_base "$profile"`" = "$generation" test "`readlink_base "$profile"`" = "$generation"
# The following command should not delete the current generation, even though
# it matches the given pattern (see <http://bugs.gnu.org/19978>.) And since
# there's nothing else to delete, it should just fail.
guix package --list-generations -p "$profile"
if guix package --bootstrap -p "$profile" --delete-generations=1..
then false; else true; fi
test "`readlink_base "$profile"`" = "$generation"
# Make sure $profile is a GC root at this point. # Make sure $profile is a GC root at this point.
real_profile="`readlink -f "$profile"`" real_profile="`readlink -f "$profile"`"
if guix gc -d "$real_profile" if guix gc -d "$real_profile"