summaryrefslogtreecommitdiff
path: root/guix/scripts/import
diff options
context:
space:
mode:
authorFederico Beffa <beffa@fbengineering.ch>2017-02-11 18:18:45 +0100
committerFederico Beffa <beffa@fbengineering.ch>2017-02-14 08:38:45 +0100
commit57075ade97e58eded5657ec74e5516d58f15eda6 (patch)
treeb0c753d829f85efb00c6991e8443f3e5f7a3b504 /guix/scripts/import
parent4fc282b32a16946d423cdbbdd7ee94d025d3b9f5 (diff)
downloadguix-patches-57075ade97e58eded5657ec74e5516d58f15eda6.tar
guix-patches-57075ade97e58eded5657ec74e5516d58f15eda6.tar.gz
import: stackage: Avoid using (guix ui) in importer code.
* guix/import/stackage.scm (stackage->guix-package, stackage-lts-info-fetch): Raise 'message' condition instead of using 'leave' from (guix ui). * guix/scripts/import/stackage.scm (guix-import-stackage): Handle conditions.
Diffstat (limited to 'guix/scripts/import')
-rw-r--r--guix/scripts/import/stackage.scm19
1 files changed, 10 insertions, 9 deletions
diff --git a/guix/scripts/import/stackage.scm b/guix/scripts/import/stackage.scm
index cf47bff259..f91b496d24 100644
--- a/guix/scripts/import/stackage.scm
+++ b/guix/scripts/import/stackage.scm
@@ -98,15 +98,16 @@ Import and convert the LTS Stackage package for PACKAGE-NAME.\n"))
(reverse opts))))
(match args
((package-name)
- (let ((sexp (stackage->guix-package
- package-name
- #:include-test-dependencies?
- (assoc-ref opts 'include-test-dependencies?)
- #:lts-version (assoc-ref opts 'lts-version))))
- (unless sexp
- (leave (_ "failed to download cabal file for package '~a'~%")
- package-name))
- sexp))
+ (with-error-handling
+ (let ((sexp (stackage->guix-package
+ package-name
+ #:include-test-dependencies?
+ (assoc-ref opts 'include-test-dependencies?)
+ #:lts-version (assoc-ref opts 'lts-version))))
+ (unless sexp
+ (leave (_ "failed to download cabal file for package '~a'~%")
+ package-name))
+ sexp)))
(()
(leave (_ "too few arguments~%")))
((many ...)