diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-11-07 00:33:16 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-11-07 00:33:16 -0500 |
| commit | 71e21fb26dceef7a665b3b1c0dec7ebd92d8ec82 (patch) | |
| tree | 7553a6f9ee2ed7494968e7277897098559eacf23 /guix/scripts/package.scm | |
| parent | 19ac2ba858ebc46db96364809ebfc129be9e4ccf (diff) | |
| parent | 14ac8e4865206f5cd1278cd962d01ce27890d51f (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/package.scm')
| -rw-r--r-- | guix/scripts/package.scm | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 70ed0a7ea6..96a22f6fab 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2014, 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Roel Janssen <roel@gnu.org> ;;; Copyright © 2016 Benz Schenk <benz.schenk@uzh.ch> +;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -782,12 +783,7 @@ processed, #f otherwise." #:key dry-run?) "Switch PROFILE to the generation specified by SPEC." (unless dry-run? - (let* ((number (string->number spec)) - (number (and number - (case (string-ref spec 0) - ((#\+ #\-) - (relative-generation profile number)) - (else number))))) + (let ((number (relative-generation-spec->number profile spec))) (if number (switch-to-generation* profile number) (leave (_ "cannot switch to generation '~a'~%") spec))))) |