01/08: svn-download, hg-download: Use 'report-invoke-error'.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit b55409b2c0a0cb53f251ceab7746d35805b64ab7
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Oct 10 00:03:57 2020 +0200

    svn-download, hg-download: Use 'report-invoke-error'.
    
    * guix/build/hg.scm (hg-fetch): Use 'report-invoke-error' instead of
    'format'.
    * guix/build/svn.scm (svn-fetch): Likewise.
---
 guix/build/hg.scm  |  8 +-------
 guix/build/svn.scm | 10 ++--------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/guix/build/hg.scm b/guix/build/hg.scm
index 1cceb63..0ffad7f 100644
--- a/guix/build/hg.scm
+++ b/guix/build/hg.scm
@@ -41,13 +41,7 @@ Mercurial changeset identifier.  Return #t on success, #f 
otherwise."
   (mkdir-p directory)
 
   (guard (c ((invoke-error? c)
-             (format (current-error-port)
-                     "hg-fetch: '~a~{ ~a~}' failed with exit code ~a~%"
-                     (invoke-error-program c)
-                     (invoke-error-arguments c)
-                     (or (invoke-error-exit-status c)
-                         (invoke-error-stop-signal c)
-                         (invoke-error-term-signal c)))
+             (report-invoke-error c)
              (delete-file-recursively directory)
              #f))
     (with-directory-excursion directory
diff --git a/guix/build/svn.scm b/guix/build/svn.scm
index f6b4ca0..44d77a9 100644
--- a/guix/build/svn.scm
+++ b/guix/build/svn.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
 ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
@@ -40,13 +40,7 @@
   "Fetch REVISION from URL into DIRECTORY.  REVISION must be an integer, and a
 valid Subversion revision.  Return #t on success, #f otherwise."
   (guard (c ((invoke-error? c)
-             (format (current-error-port)
-                     "svn-fetch: '~a~{ ~a~}' failed with exit code ~a~%"
-                     (invoke-error-program c)
-                     (invoke-error-arguments c)
-                     (or (invoke-error-exit-status c)
-                         (invoke-error-stop-signal c)
-                         (invoke-error-term-signal c)))
+             (report-invoke-error c)
              #f))
     (apply invoke svn-command
            "export" "--non-interactive"