diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
| commit | 0747328e317de4bf936fab50e795d1e1523adfc1 (patch) | |
| tree | 291d4f07a801b147d64faec31e4394c5cd46ce35 /guix/scripts | |
| parent | df09e1d6e71f68a8fb44bcc9f13e625f9f9701a5 (diff) | |
| parent | ff75441fcf0ba1212b0342f933a8999bafe60f03 (diff) | |
| download | guix-patches-0747328e317de4bf936fab50e795d1e1523adfc1.tar guix-patches-0747328e317de4bf936fab50e795d1e1523adfc1.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/pull.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 41c7fb289a..683ab3f059 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -69,7 +69,7 @@ (multiplexed-build-output? . #t) (graft? . #t) (debug . 0) - (verbosity . 2))) + (verbosity . 1))) (define (show-help) (display (G_ "Usage: guix pull [OPTION]... @@ -197,11 +197,13 @@ true, display what would be built without actually building it." (match (which "guix") (#f (return #f)) (str - (let ((command (string-append profile "/bin/guix"))) - (unless (string=? command str) + (let ((new (map (cut string-append <> "/bin/guix") + (list (user-friendly-profile profile) + profile)))) + (unless (member str new) (display-hint (format #f (G_ "After setting @code{PATH}, run @command{hash guix} to make sure your shell refers to @file{~a}.") - command))) + (first new)))) (return #f)))))))) (define (honor-lets-encrypt-certificates! store) |