diff options
| author | Nikita Karetnikov <nikita@karetnikov.org> | 2013-09-25 01:55:27 +0000 |
|---|---|---|
| committer | Nikita Karetnikov <nikita@karetnikov.org> | 2013-09-25 16:10:40 +0000 |
| commit | 9ac9360d6e86e7d16756d8e28ce61e288551c2db (patch) | |
| tree | 4e27796e0d8d71a2264491dc8d0344e0d9222c29 | |
| parent | aad5af9f40951bac7c8822b754aa20946b2cb8a4 (diff) | |
| download | patches-9ac9360d6e86e7d16756d8e28ce61e288551c2db.tar patches-9ac9360d6e86e7d16756d8e28ce61e288551c2db.tar.gz | |
guix package: Show which generation is the current one.
* guix/scripts/package.scm (guix-package)[process-query]: Show that a
generation is the current one if the profile points to it.
* tests/guix-package.sh: Test it.
| -rw-r--r-- | guix/scripts/package.scm | 14 | ||||
| -rw-r--r-- | tests/guix-package.sh | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index dab3d5bb0c..66505f172f 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -956,11 +956,15 @@ more information.~%")) (('list-generations pattern) (define (list-generation number) (unless (zero? number) - (format #t (_ "Generation ~a\t~a~%") number - (date->string - (time-utc->date - (generation-time profile number)) - "~b ~d ~Y ~T")) + (let ((header (format #f (_ "Generation ~a\t~a") number + (date->string + (time-utc->date + (generation-time profile number)) + "~b ~d ~Y ~T"))) + (current (generation-number profile))) + (if (= number current) + (format #t (_ "~a\t(current)~%") header) + (format #t "~a~%" header))) (for-each (match-lambda ((name version output location _) (format #t " ~a\t~a\t~a\t~a~%" diff --git a/tests/guix-package.sh b/tests/guix-package.sh index 524ff32f17..5f97aff026 100644 --- a/tests/guix-package.sh +++ b/tests/guix-package.sh @@ -119,6 +119,9 @@ then test "`readlink_base "$profile"`" = "$profile-1-link" test -x "$profile/bin/guile" && ! test -x "$profile/bin/make" + # Check that the first generation is the current one. + test "`guix package -p "$profile" -l 1 | cut -f3 | head -n1`" = "(current)" + # Roll-back to generation 0, and install---all at once. guix package --bootstrap -p "$profile" --roll-back -i guile-bootstrap test "`readlink_base "$profile"`" = "$profile-1-link" |