[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/09: swh: 'swh-download' prints debugging info.
From: |
guix-commits |
Subject: |
01/09: swh: 'swh-download' prints debugging info. |
Date: |
Wed, 28 Aug 2019 12:53:11 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit b8815c5ec4ee70c535693031072447671c1b781f
Author: Ludovic Courtès <address@hidden>
Date: Wed Aug 28 11:10:55 2019 +0200
swh: 'swh-download' prints debugging info.
* guix/git-download.scm (git-fetch): Print a message before calling
'swh-download'.
* guix/swh.scm (swh-download): Add #:log-port. Write debugging messages
to LOG-PORT.
---
guix/git-download.scm | 7 +++++--
guix/swh.scm | 12 ++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/guix/git-download.scm b/guix/git-download.scm
index 8f84681..c62bb8a 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -139,8 +139,11 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a
generic name if #f."
;; As a last resort, attempt to download from Software
Heritage.
;; XXX: Currently recursive checkouts are not supported.
(and (not recursive?)
- (swh-download (getenv "git url") (getenv "git commit")
- #$output)))))))
+ (begin
+ (format (current-error-port)
+ "Trying to download from Software
Heritage...~%")
+ (swh-download (getenv "git url") (getenv "git commit")
+ #$output))))))))
(mlet %store-monad ((guile (package->derivation guile system)))
(gexp->derivation (or name "git-checkout") build
diff --git a/guix/swh.scm b/guix/swh.scm
index 1c416c8..b72d1c3 100644
--- a/guix/swh.scm
+++ b/guix/swh.scm
@@ -533,7 +533,8 @@ delete it when leaving the dynamic extent of this call."
(lambda ()
(false-if-exception (delete-file-recursively tmp-dir))))))
-(define (swh-download url reference output)
+(define* (swh-download url reference output
+ #:key (log-port (current-error-port)))
"Download from Software Heritage a checkout of the Git tag or commit
REFERENCE originating from URL, and unpack it in OUTPUT. Return #t on success
and #f on failure.
@@ -545,10 +546,17 @@ wait until it becomes available, which could take several
minutes."
(lookup-revision reference)
(lookup-origin-revision url reference))
((? revision? revision)
+ (format log-port "SWH: found revision ~a with directory at '~a'~%"
+ (revision-id revision)
+ (swh-url (revision-directory-url revision)))
(call-with-temporary-directory
(lambda (directory)
- (match (vault-fetch (revision-directory revision) 'directory)
+ (match (vault-fetch (revision-directory revision) 'directory
+ #:log-port log-port)
(#f
+ (format log-port
+ "SWH: directory ~a could not be fetched from the vault~%"
+ (revision-directory revision))
#f)
((? port? input)
(let ((tar (open-pipe* OPEN_WRITE "tar" "-C" directory "-xzvf"
"-")))
- branch master updated (c6deb68 -> dae950c), guix-commits, 2019/08/28
- 02/09: swh: Correctly handle visits without a snapshot., guix-commits, 2019/08/28
- 08/09: remote, ssh: Show the command exit status upon failure., guix-commits, 2019/08/28
- 04/09: gnu: Add cedille., guix-commits, 2019/08/28
- 05/09: lint: Log diagnostics with 'info', not 'warning'., guix-commits, 2019/08/28
- 06/09: diagnostics: Avoid highlighting complete messages., guix-commits, 2019/08/28
- 03/09: gnu: agda-ial: Fix install step., guix-commits, 2019/08/28
- 01/09: swh: 'swh-download' prints debugging info.,
guix-commits <=
- 09/09: deploy: Do not quote error messages., guix-commits, 2019/08/28
- 07/09: gnu: emacs-evil-owl: Update to 0.0.1-2.e8fe5b2., guix-commits, 2019/08/28