diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-03-29 21:44:31 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-29 21:44:31 +0100 |
commit | 4928e50033615e1d130dd84f131eff4cbc702ccf (patch) | |
tree | 320ff9bae85de20b0293119653b07b1197eaaa82 /guix/scripts/pull.scm | |
parent | 14a3a67364f46b24d7e39d64ac92879c3eb7f8eb (diff) | |
parent | 3f5a932eeaa8111b841de64b742b1cc408f2419a (diff) |
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
gnu/packages/base.scm
Diffstat (limited to 'guix/scripts/pull.scm')
-rw-r--r-- | guix/scripts/pull.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 942bf501c5..bc72dc4088 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -194,9 +194,9 @@ Download and deploy the latest version of Guix.\n")) (leave (_ "~A: unexpected argument~%") arg)) %default-options)) - (let ((opts (parse-options)) - (store (open-connection))) - (with-error-handling + (with-error-handling + (let ((opts (parse-options)) + (store (open-connection))) (let ((tarball (download-and-store store))) (unless tarball (leave (_ "failed to download up-to-date source, exiting\n"))) |