diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-03-07 19:29:12 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-07 19:44:14 +0100 |
| commit | ef86c39f27b0d1c21435ea54cba5fb247e341537 (patch) | |
| tree | b0e93558496a06d6e0ee036f75423a083b8787b2 /guix/scripts/package.scm | |
| parent | 1fb78cb2c36a6b0d7a3ecf1f7150c4d99b01c1a9 (diff) | |
| download | guix-patches-ef86c39f27b0d1c21435ea54cba5fb247e341537.tar guix-patches-ef86c39f27b0d1c21435ea54cba5fb247e341537.tar.gz | |
ui: Gracefully report failures to connect to the daemon.
* guix/store.scm (&nix-connection-error): New condition type.
(open-connection): Translate `system-error' during the `connect' call
into `&nix-connection-error'.
* guix/ui.scm (call-with-error-handling): Add case for `nix-connection-error?'.
* guix/scripts/package.scm (guix-package): Move `open-connection' call
within `with-error-handling'.
* guix/scripts/pull.scm (guix-pull): Likewise.
* guix/scripts/download.scm (guix-download): Move body within
`with-error-handling'.
Diffstat (limited to 'guix/scripts/package.scm')
| -rw-r--r-- | guix/scripts/package.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index dd7d6ca112..a9ed79184e 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -712,8 +712,8 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n")) (let ((opts (parse-options))) (or (process-query opts) - (parameterize ((%store (open-connection))) - (with-error-handling + (with-error-handling + (parameterize ((%store (open-connection))) (parameterize ((%guile-for-build (package-derivation (%store) (if (assoc-ref opts 'bootstrap?) |