diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-09-14 16:17:19 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-09-14 16:17:19 -0400 |
| commit | fa8fe90edb4efaf7d52f71516c4dcabb13d56418 (patch) | |
| tree | 8d69a1132e95845d8a3d90f1fe4d0ef04039e2f4 /guix/scripts/pull.scm | |
| parent | 1bec03df9b60f156c657a64a323ef27f4ed14b44 (diff) | |
| parent | d60739dff2e2f5eb74173b73a5fd207ef7cd110a (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'guix/scripts/pull.scm')
| -rw-r--r-- | guix/scripts/pull.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 5b4ccf13fe..bb1b560a22 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -507,6 +507,7 @@ true, display what would be built without actually building it." ;; workaround, skip this code when $SUDO_USER is set. See ;; <https://bugs.gnu.org/36785>. (unless (or (getenv "SUDO_USER") + (not (file-exists? %user-profile-directory)) (string=? %profile-directory (dirname (canonicalize-profile %user-profile-directory)))) @@ -750,7 +751,9 @@ Use '~/.config/guix/channels.scm' instead.")) channels))) -(define (guix-pull . args) +(define-command (guix-pull . args) + (synopsis "pull the latest revision of Guix") + (with-error-handling (with-git-error-handling (let* ((opts (parse-command-line args %options |