From 0663302618d6bef25bf09f694a91ab05fe7a9bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 28 Apr 2019 15:05:41 +0200 Subject: [PATCH] describe: Provide a hint when origin detection fails. * guix/scripts/describe.scm (display-checkout-info): Add call to 'display-hint' in the error case. --- guix/scripts/describe.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm index b6287d3a4c..fa6b6cae37 100644 --- a/guix/scripts/describe.scm +++ b/guix/scripts/describe.scm @@ -18,6 +18,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix scripts describe) + #:use-module ((guix config) #:select (%guix-version)) #:use-module ((guix ui) #:hide (display-profile-content)) #:use-module (guix channels) #:use-module (guix scripts) @@ -114,7 +115,12 @@ within a Git checkout." (lambda () (repository-discover (dirname program))) (lambda (key err) - (leave (G_ "failed to determine origin~%"))))) + (report-error (G_ "failed to determine origin~%")) + (display-hint (format #f (G_ "Perhaps this +@command{guix} command was not obtained with @command{guix pull}? Its version +string is ~a.~%") + %guix-version)) + (exit 1)))) (repository (repository-open directory)) (head (repository-head repository)) (commit (oid->string (reference-target head))))