diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index f772083c6..a1b839e9a 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015, 2017 Ludovic Courtès ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2018 Konrad Hinsen ;;; ;;; This file is part of GNU Guix. ;;; @@ -347,6 +348,9 @@ Create a bundle of PACKAGE.\n")) -C, --compression=TOOL compress using TOOL--e.g., \"lzip\"")) (display (G_ " -S, --symlink=SPEC create symlinks to the profile according to SPEC")) + (display (G_ " + -m, --manifest=FILE create a new profile generation with the manifest + from FILE")) (display (G_ " --localstatedir include /var/guix in the resulting pack")) (newline) @@ -383,12 +387,12 @@ Create a bundle of PACKAGE.\n")) (manifest-file (assoc-ref opts 'manifest))) (cond ((and manifest-file (not (null? packages))) - (leave (G_ "both a manifest and a package list were given"))) + (leave (G_ "both a manifest and a package list were given~%"))) (manifest-file - (let ((user-module (make-user-module '((guix profiles) (gnu))))) + (let ((user-module (make-user-module '((guix profiles) (gnu))))) (load* manifest-file user-module))) (else (packages->manifest packages))))) - + (with-error-handling (parameterize ((%graft? (assoc-ref opts 'graft?))) (let* ((dry-run? (assoc-ref opts 'dry-run?))