summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-25 19:33:19 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-25 21:34:23 +0200
commit5f1087c48144e15d9e37d23b559017f9d7e326cd (patch)
tree15ebd0f8b3389de2dc22cd0c09870a23c73ef9ed /guix
parent2abcc97fd1867176d5530f988ab34c26530de2c2 (diff)
guix package: --manifest DTRT when combined with --dry-run.
* guix/scripts/package.scm (guix-package)[process-actions]: Process 'manifest action regardless of whether 'dry-run? is set. Adjust the message accordingly. * tests/guix-package.sh: Add error-reporting test.
Diffstat (limited to 'guix')
-rw-r--r--guix/scripts/package.scm14
1 files changed, 8 insertions, 6 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 06ee441799..9da6b9ec1e 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -886,14 +886,16 @@ more information.~%"))
(alist-delete 'delete-generations opts)))
(_ #f))
opts))
- ((and (assoc-ref opts 'manifest)
- (not dry-run?))
- (let* ((file-name (assoc-ref opts 'manifest))
+ ((assoc-ref opts 'manifest)
+ (let* ((file-name (assoc-ref opts 'manifest))
(user-module (make-user-module '((guix profiles)
(gnu))))
- (manifest (load* file-name user-module)))
- (format #t (_ "installing new manifest from ~a with ~d entries.~%")
- file-name (length (manifest-entries manifest)))
+ (manifest (load* file-name user-module)))
+ (if (assoc-ref opts 'dry-run?)
+ (format #t (_ "would install new manifest from '~a' with ~d entries~%")
+ file-name (length (manifest-entries manifest)))
+ (format #t (_ "installing new manifest from '~a' with ~d entries~%")
+ file-name (length (manifest-entries manifest))))
(build-and-use-profile manifest)))
(else
(let* ((manifest (profile-manifest profile))