guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/03: gnu-maintenance: Call 'adjusted-upstream-source' only when there'


From: guix-commits
Subject: 01/03: gnu-maintenance: Call 'adjusted-upstream-source' only when there's a source.
Date: Mon, 20 Jul 2020 17:45:15 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit a022f5a4c1e6176f032df93d9e88b54c00b2c0d5
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jul 20 23:31:48 2020 +0200

    gnu-maintenance: Call 'adjusted-upstream-source' only when there's a source.
    
    This is a followup to 59a47fb67853dd28891376fc970699f11c0f972f.
    
    * guix/gnu-maintenance.scm (latest-savannah-release): Call
    'adjusted-upstream-source' only when 'latest-html-release' returns
    true.
    (latest-kernel.org-release): Likewise.
---
 guix/gnu-maintenance.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 2a85504..91203f5 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -647,10 +647,10 @@ releases are on gnu.org."
          (directory (dirname (uri-path uri)))
          (rewrite   (url-prefix-rewrite %savannah-base
                                         "mirror://savannah")))
-    (adjusted-upstream-source (latest-html-release package
-                                                   #:base-url %savannah-base
-                                                   #:directory directory)
-                              rewrite)))
+    (and=> (latest-html-release package
+                                #:base-url %savannah-base
+                                #:directory directory)
+           (cut adjusted-upstream-source <> rewrite))))
 
 (define (latest-xorg-release package)
   "Return the latest release of PACKAGE."
@@ -677,12 +677,11 @@ releases are on gnu.org."
          (directory (dirname (uri-path uri)))
          (rewrite   (url-prefix-rewrite %kernel.org-base
                                         "mirror://kernel.org")))
-    (adjusted-upstream-source (latest-html-release package
-                                                   #:base-url %kernel.org-base
-                                                   #:directory directory
-                                                   #:file->signature
-                                                   file->signature)
-                              rewrite)))
+    (and=> (latest-html-release package
+                                #:base-url %kernel.org-base
+                                #:directory directory
+                                #:file->signature file->signature)
+           (cut adjusted-upstream-source <> rewrite))))
 
 (define %gnu-updater
   ;; This is for everything at ftp.gnu.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]