diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-01-10 14:30:36 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-01-10 14:30:36 +0200 |
| commit | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (patch) | |
| tree | 4df49b9f438e0e466efb3d589027a62b39d49761 /guix/scripts/import | |
| parent | 87eaa4207208e16e5e1b22b60ba4ff5c3d035023 (diff) | |
| parent | d0fff8f840afc17be40bdc49bff52ed08d5a1a7b (diff) | |
| download | guix-patches-6985a1acb3e9cc4cad8b6f63d77154842d25c929.tar guix-patches-6985a1acb3e9cc4cad8b6f63d77154842d25c929.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts/import')
| -rw-r--r-- | guix/scripts/import/elpa.scm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/guix/scripts/import/elpa.scm b/guix/scripts/import/elpa.scm index 07ac07a3d5..d6b38e5c4b 100644 --- a/guix/scripts/import/elpa.scm +++ b/guix/scripts/import/elpa.scm @@ -96,13 +96,14 @@ Import the latest package named PACKAGE-NAME from an ELPA repository.\n")) (match args ((package-name) (if (assoc-ref opts 'recursive) - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) - (elpa-recursive-import package-name - (or (assoc-ref opts 'repo) 'gnu))) + (with-error-handling + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (elpa-recursive-import package-name + (or (assoc-ref opts 'repo) 'gnu)))) (let ((sexp (elpa->guix-package package-name #:repo (assoc-ref opts 'repo)))) (unless sexp |