diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-21 12:07:40 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-01-21 13:14:24 -0500 |
| commit | 87e62148c45c84c2514a60e610921f61fa5c0bfc (patch) | |
| tree | cc6d451880d6f3c183c8a542dd4ee7afa45a4660 | |
| parent | 9b6a75a2782019d5ef930b8bbf8fc93f8129de72 (diff) | |
packages: Silence tar's support for --sort check output.
* guix/packages.scm (patch-and-repack)
<tar-supports-sort?>: Invoke with 'invoke/quiet', catching any message
condition.
Change-Id: I1feee605f77bfe633d22901a3250e4c530fee6a6
| -rw-r--r-- | guix/packages.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index 64d1bc6158..15935ebfdd 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -961,14 +961,18 @@ specifies modules in scope when evaluating SNIPPET." (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) |