guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

43/155: guix import: Print list of expressions.


From: John Darrington
Subject: 43/155: guix import: Print list of expressions.
Date: Wed, 21 Dec 2016 20:48:32 +0000 (UTC)

jmd pushed a commit to branch wip-installer
in repository guix.

commit 7d29739f3a9aca1e5591f3d866e9a62696f16d19
Author: Ricardo Wurmus <address@hidden>
Date:   Tue May 17 16:42:41 2016 +0200

    guix import: Print list of expressions.
    
    * guix/scripts/import.scm (guix-import): Print list of expressions.
---
 guix/scripts/import.scm |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm
index c671686..4d07e0f 100644
--- a/guix/scripts/import.scm
+++ b/guix/scripts/import.scm
@@ -107,10 +107,17 @@ 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 (lambda (expr)
+                          (print expr)
+                          (newline))
+                        expressions))
+             (x
+              (leave (_ "'~a' import failed~%") importer))))
          (leave (_ "~a: invalid importer~%") importer)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]