diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-05-23 14:55:44 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-05-23 15:02:26 +0200 |
| commit | bc73a84398fa54b0a11a80c749bf78eb0a58dbe6 (patch) | |
| tree | 3e7b6670989ceb4f31464bad632c0332121d96a0 /guix/scripts/import.scm | |
| parent | 12b6f6527e49c8c4191929a72b1692dbd9eb2440 (diff) | |
| parent | 624d4e2e6ba402c374a340869306eec65a808a20 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/import.scm')
| -rw-r--r-- | guix/scripts/import.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index 7b29794e8f..e54744feca 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -107,7 +107,10 @@ Run IMPORTER with ARGS.\n")) (show-version-and-exit "guix import")) ((importer args ...) (if (member importer importers) - (let ((expr (apply (resolve-importer importer) args))) - (pretty-print expr (newline-rewriting-port (current-output-port)))) - (format (current-error-port) - (_ "guix import: invalid importer~%")))))) + (match (apply (resolve-importer importer) args) + ((and expr ('package _ ...)) + (pretty-print expr (newline-rewriting-port + (current-output-port)))) + (x + (leave (_ "'~a' import failed~%") importer))) + (leave (_ "~a: invalid importer~%") importer))))) |