From 92f66ab60d840094b59705f2e13c94bbcef6433b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 21 Jan 2024 12:07:40 -0500 Subject: [PATCH] packages: Silence tar's support for --sort check output. * guix/packages.scm (patch-and-repack) : Invoke with 'invoke/quiet', catching any message condition. Change-Id: I1feee605f77bfe633d22901a3250e4c530fee6a6 --- guix/packages.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 94254f0154..f373136d22 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1009,14 +1009,18 @@ (define build (ice-9 regex) (srfi srfi-1) (srfi srfi-26) + (srfi srfi-34) + (srfi srfi-35) (guix build utils)) ;; The --sort option was added to GNU tar in version 1.28, released ;; 2014-07-28. During bootstrap we must cope with older versions. (define tar-supports-sort? - (zero? (system* (string-append #+tar "/bin/tar") + (guard (c ((message-condition? c) #f)) + (invoke/quiet (string-append #+tar "/bin/tar") "cf" "/dev/null" "--files-from=/dev/null" - "--sort=name"))) + "--sort=name") + #t)) (define (apply-patch patch) (format (current-error-port) "applying '~a'...~%" patch)