diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-04-07 22:27:45 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-07 22:28:36 +0200 |
commit | 4ae7559fd62c03a800b010c228639f18b9f58006 (patch) | |
tree | 70b5a9f9f214993fdad29018ed10835a951090d0 | |
parent | 1151f6aeae281ae391f925f5cee086f1c2a0728a (diff) | |
download | guix-4ae7559fd62c03a800b010c228639f18b9f58006.tar.gz |
gnu: Emit a warning when a package module cannot be loaded.
* guix/ui.scm (warn-about-load-error): New procedure. * gnu/packages.scm (package-modules): Wrap 'resolve-interface' call in 'catch #t', and call 'warn-about-load-error' in handler.
-rw-r--r-- | gnu/packages.scm | 12 | ||||
-rw-r--r-- | guix/ui.scm | 16 |
2 files changed, 25 insertions, 3 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm index 57a3e21bd6..2216c0df8c 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -160,9 +160,15 @@ Optionally, narrow the search to SUB-DIRECTORY." (string-length directory)) (filter-map (lambda (file) - (let ((file (substring file prefix-len))) - (false-if-exception - (resolve-interface (file-name->module-name file))))) + (let* ((file (substring file prefix-len)) + (module (file-name->module-name file))) + (catch #t + (lambda () + (resolve-interface module)) + (lambda args + ;; Report the error, but keep going. + (warn-about-load-error module args) + #f)))) (scheme-files (if sub-directory (string-append directory "/" sub-directory) directory)))) diff --git a/guix/ui.scm b/guix/ui.scm index 80a4a6338a..9e75a35d16 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -48,6 +48,7 @@ report-error leave report-load-error + warn-about-load-error show-version-and-exit show-bug-report-information string->number* @@ -148,6 +149,21 @@ ARGS is the list of arguments received by the 'throw' handler." (apply display-error #f (current-error-port) args) (exit 1)))) +(define (warn-about-load-error file args) ;FIXME: factorize with ↑ + "Report the failure to load FILE, a user-provided Scheme file, without +exiting. ARGS is the list of arguments received by the 'throw' handler." + (match args + (('system-error . _) + (let ((err (system-error-errno args))) + (warning (_ "failed to load '~a': ~a~%") file (strerror err)))) + (('syntax-error proc message properties form . rest) + (let ((loc (source-properties->location properties))) + (format (current-error-port) (_ "~a: warning: ~a~%") + (location->string loc) message))) + ((error args ...) + (warning (_ "failed to load '~a':~%") file) + (apply display-error #f (current-error-port) args)))) + (define (install-locale) "Install the current locale settings." (catch 'system-error |