summaryrefslogtreecommitdiff
path: root/guix/upstream.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-12-07 23:54:35 +0100
committerLudovic Courtès <ludo@gnu.org>2015-12-07 23:57:20 +0100
commit6efa6f7645a95a08b0d4c663cd4a873eb0003555 (patch)
tree997f930b18c442e57362128900a10d40464abf2d /guix/upstream.scm
parente80c0f85ba3429d0a43830247a2212ed93f67d49 (diff)
gnu-maintenance: ftp.gnome.org does not provide signatures.
* guix/gnu-maintenance.scm (latest-ftp-release): Add #:file->signature parameter. Honor it. (latest-gnome-release): Pass #:file->signature. * guix/upstream.scm (coalesce-sources): Keep 'signature-urls' as #f unless both sources provide it.
Diffstat (limited to 'guix/upstream.scm')
-rw-r--r--guix/upstream.scm5
1 files changed, 3 insertions, 2 deletions
diff --git a/guix/upstream.scm b/guix/upstream.scm
index 12eed3f2b4..c62667dd01 100644
--- a/guix/upstream.scm
+++ b/guix/upstream.scm
@@ -98,8 +98,9 @@ correspond to the same version."
(urls (append (upstream-source-urls release)
(upstream-source-urls head)))
(signature-urls
- (append (upstream-source-signature-urls release)
- (upstream-source-signature-urls head))))
+ (let ((one (upstream-source-signature-urls release))
+ (two (upstream-source-signature-urls release)))
+ (and one two (append one two)))))
tail)
(cons release result)))
(()