[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)))))
- 71/155: gnu: gnuplot: Update to 5.0.5., (continued)
- 71/155: gnu: gnuplot: Update to 5.0.5., John Darrington, 2016/12/21
- 83/155: doc: Make 'guix pull' more visible., John Darrington, 2016/12/21
- 85/155: services: Use 'file-append' in more places., John Darrington, 2016/12/21
- 93/155: gnu: linux-libre: Fix typo., John Darrington, 2016/12/21
- 91/155: gnu: Add python-xopen., John Darrington, 2016/12/21
- 100/155: gnu: utox: Fix description., John Darrington, 2016/12/21
- 82/155: doc: Mention 'swapon'., John Darrington, 2016/12/21
- 70/155: gnu: wxmaxima: Update to 16.12.0., John Darrington, 2016/12/21
- 37/155: import cran: Remove more invalid characters from package names., John Darrington, 2016/12/21
- 38/155: import cran: Move guix-name to top-level., John Darrington, 2016/12/21
- 43/155: guix import: Print list of expressions.,
John Darrington <=
- 51/155: gnu: Add attribution line for Raoul Bonnal., John Darrington, 2016/12/21
- 60/155: tests: Adjust cpan tests., John Darrington, 2016/12/21
- 54/155: tests: Mock up http-fetch in import tests., John Darrington, 2016/12/21
- 58/155: build: check-final-inputs-self-contained has an exception for 'bash:include'., John Darrington, 2016/12/21
- 62/155: gnu: python-docutils: Update to 0.13.1, John Darrington, 2016/12/21
- 66/155: build: Add 'guix-publish.*.in' to the distribution., John Darrington, 2016/12/21
- 69/155: gnu: tor: split description into two parts for easier reading., John Darrington, 2016/12/21
- 72/155: gnu: gnumach-headers: Update to 1.8., John Darrington, 2016/12/21
- 75/155: gnu: pcsc-lite: Update to 1.8.19., John Darrington, 2016/12/21
- 87/155: gexp: Slightly simplify 'gexp-inputs'., John Darrington, 2016/12/21