guix-commits
[Top][All Lists]
Advanced

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

03/03: gnu-maintenance: Relax recursion cutoff in 'latest-ftp-release'.


From: Ludovic Courtès
Subject: 03/03: gnu-maintenance: Relax recursion cutoff in 'latest-ftp-release'.
Date: Fri, 24 Nov 2017 12:48:48 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 026f6a42b680207a59beadf0b0b9cc1753f55605
Author: Ludovic Courtès <address@hidden>
Date:   Fri Nov 24 18:44:08 2017 +0100

    gnu-maintenance: Relax recursion cutoff in 'latest-ftp-release'.
    
    Fixes <https://bugs.gnu.org/25020>.
    Reported by Hartmut Goebel <address@hidden>.
    
    * guix/gnu-maintenance.scm (latest-ftp-release)[contains-digit?]: Remove.
    Relax test as to whether to recurse into subdirectories.
---
 guix/gnu-maintenance.scm | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 0de36f2..00e80bc 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -335,9 +335,6 @@ return the corresponding signature URL, or #f it signatures 
are unavailable."
     (if (version>? (upstream-source-version a) (upstream-source-version b))
         a b))
 
-  (define contains-digit?
-    (cut string-any char-set:digit <>))
-
   (define patch-directory-name?
     ;; Return #t for patch directory names such as 'bash-4.2-patches'.
     (cut string-suffix? "patches" <>))
@@ -361,8 +358,7 @@ return the corresponding signature URL, or #f it signatures 
are unavailable."
              (result    #f))
     (let* ((entries (ftp-list conn directory))
 
-           ;; Filter out sub-directories that do not contain digits---e.g.,
-           ;; /gnuzilla/lang and /gnupg/patches.  Filter out "w32"
+           ;; Filter out things like /gnupg/patches.  Filter out "w32"
            ;; directories as found on ftp.gnutls.org.
            (subdirs (filter-map (match-lambda
                                   (((? patch-directory-name? dir)
@@ -370,8 +366,8 @@ return the corresponding signature URL, or #f it signatures 
are unavailable."
                                    #f)
                                   (("w32" 'directory . _)
                                    #f)
-                                  (((? contains-digit? dir) 'directory . _)
-                                   (and (keep-file? dir) dir))
+                                  ((directory 'directory . _)
+                                   directory)
                                   (_ #f))
                                 entries))
 



reply via email to

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