[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 7/7] guix import: Print list of expressions.
From: |
Ricardo Wurmus |
Subject: |
[PATCH 7/7] guix import: Print list of expressions. |
Date: |
Mon, 23 May 2016 17:40:08 +0200 |
* guix/scripts/import.scm (guix-import): Print list of expressions.
---
guix/scripts/import.scm | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm
index e54744f..5cda3dd 100644
--- a/guix/scripts/import.scm
+++ b/guix/scripts/import.scm
@@ -107,10 +107,14 @@ Run IMPORTER with ARGS.\n"))
(show-version-and-exit "guix import"))
((importer args ...)
(if (member importer importers)
- (match (apply (resolve-importer importer) args)
- ((and expr ('package _ ...))
- (pretty-print expr (newline-rewriting-port
- (current-output-port))))
- (x
- (leave (_ "'~a' import failed~%") importer)))
+ (let ((print (lambda (expr)
+ (pretty-print expr (newline-rewriting-port
+ (current-output-port))))))
+ (match (apply (resolve-importer importer) args)
+ ((and expr ('package _ ...))
+ (print expr))
+ ((? list? expressions)
+ (for-each print expressions))
+ (x
+ (leave (_ "'~a' import failed~%") importer))))
(leave (_ "~a: invalid importer~%") importer)))))
--
2.7.3
- Re: [PATCH 1/7] import cran: Remove more invalid characters from package names., (continued)
- [PATCH 2/7] import cran: Move guix-name to top-level., Ricardo Wurmus, 2016/05/23
- [PATCH 3/7] import cran: description->package: Also return package dependencies., Ricardo Wurmus, 2016/05/23
- [PATCH 4/7] import cran: Ignore default R packages., Ricardo Wurmus, 2016/05/23
- [PATCH 5/7] import cran: Add recursive importer., Ricardo Wurmus, 2016/05/23
- [PATCH 6/7] import cran: Add "recursive" option., Ricardo Wurmus, 2016/05/23
- [PATCH 7/7] guix import: Print list of expressions.,
Ricardo Wurmus <=
- [PATCH] Add recursive CRAN importer, Ricardo Wurmus, 2016/05/24
- Re: [PATCH] Add recursive CRAN importer, Ricardo Wurmus, 2016/05/24