diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-11-05 00:46:04 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-25 23:44:20 +0100 |
| commit | e8a5db80d5fe2e603d7b72c3b3cc5ba6ea6d99d9 (patch) | |
| tree | 6c52f7c69ff235b0ef7557f1cfd20755d3af97c6 | |
| parent | 6230d6f04f4bde9ad834f97c5c950db89dde0496 (diff) | |
| download | gnu-guix-e8a5db80d5fe2e603d7b72c3b3cc5ba6ea6d99d9.tar gnu-guix-e8a5db80d5fe2e603d7b72c3b3cc5ba6ea6d99d9.tar.gz | |
offload: Remove 'with-nar-error-handling' macro.
* guix/scripts/offload.scm (with-nar-error-handling): Remove.
(guix-offload): Use 'with-error-handling' instead.
| -rw-r--r-- | guix/scripts/offload.scm | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm index 8704743a7f..35286ab9d5 100644 --- a/guix/scripts/offload.scm +++ b/guix/scripts/offload.scm @@ -664,17 +664,6 @@ defines a total order on machines.)" ;; Not now, all the machines are busy. (display "# postpone\n"))))))) -(define-syntax-rule (with-nar-error-handling body ...) - "Execute BODY with any &nar-error suitably reported to the user." - (guard (c ((nar-error? c) - (let ((file (nar-error-file c))) - (if (condition-has-type? c &message) - (leave (_ "while importing file '~a': ~a~%") - file (gettext (condition-message c))) - (leave (_ "failed to import file '~a'~%") - file))))) - body ...)) - ;;; ;;; Entry point. @@ -705,7 +694,7 @@ defines a total order on machines.)" (cond ((regexp-exec request-line-rx line) => (lambda (match) - (with-nar-error-handling + (with-error-handling (process-request (equal? (match:substring match 1) "1") (match:substring match 2) ; system (call-with-input-file |