diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-11-24 18:44:08 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-11-24 18:48:11 +0100 |
| commit | 026f6a42b680207a59beadf0b0b9cc1753f55605 (patch) | |
| tree | 1eb30d37796666720aac969b0443e174337798d3 /guix/gnu-maintenance.scm | |
| parent | f7f8930b37e1c51af99e363421eb54f2dab224f8 (diff) | |
| download | gnu-guix-026f6a42b680207a59beadf0b0b9cc1753f55605.tar gnu-guix-026f6a42b680207a59beadf0b0b9cc1753f55605.tar.gz | |
gnu-maintenance: Relax recursion cutoff in 'latest-ftp-release'.
Fixes <https://bugs.gnu.org/25020>.
Reported by Hartmut Goebel <h.goebel@crazy-compilers.com>.
* guix/gnu-maintenance.scm (latest-ftp-release)[contains-digit?]: Remove.
Relax test as to whether to recurse into subdirectories.
Diffstat (limited to 'guix/gnu-maintenance.scm')
| -rw-r--r-- | guix/gnu-maintenance.scm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 0de36f2f71..00e80bc79f 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)) |