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.
This commit is contained in:
parent
f7f8930b37
commit
026f6a42b6
|
@ -335,9 +335,6 @@ (define (latest-release a b)
|
||||||
(if (version>? (upstream-source-version a) (upstream-source-version b))
|
(if (version>? (upstream-source-version a) (upstream-source-version b))
|
||||||
a b))
|
a b))
|
||||||
|
|
||||||
(define contains-digit?
|
|
||||||
(cut string-any char-set:digit <>))
|
|
||||||
|
|
||||||
(define patch-directory-name?
|
(define patch-directory-name?
|
||||||
;; Return #t for patch directory names such as 'bash-4.2-patches'.
|
;; Return #t for patch directory names such as 'bash-4.2-patches'.
|
||||||
(cut string-suffix? "patches" <>))
|
(cut string-suffix? "patches" <>))
|
||||||
|
@ -361,8 +358,7 @@ (define (file->source directory file)
|
||||||
(result #f))
|
(result #f))
|
||||||
(let* ((entries (ftp-list conn directory))
|
(let* ((entries (ftp-list conn directory))
|
||||||
|
|
||||||
;; Filter out sub-directories that do not contain digits---e.g.,
|
;; Filter out things like /gnupg/patches. Filter out "w32"
|
||||||
;; /gnuzilla/lang and /gnupg/patches. Filter out "w32"
|
|
||||||
;; directories as found on ftp.gnutls.org.
|
;; directories as found on ftp.gnutls.org.
|
||||||
(subdirs (filter-map (match-lambda
|
(subdirs (filter-map (match-lambda
|
||||||
(((? patch-directory-name? dir)
|
(((? patch-directory-name? dir)
|
||||||
|
@ -370,8 +366,8 @@ (define (file->source directory file)
|
||||||
#f)
|
#f)
|
||||||
(("w32" 'directory . _)
|
(("w32" 'directory . _)
|
||||||
#f)
|
#f)
|
||||||
(((? contains-digit? dir) 'directory . _)
|
((directory 'directory . _)
|
||||||
(and (keep-file? dir) dir))
|
directory)
|
||||||
(_ #f))
|
(_ #f))
|
||||||
entries))
|
entries))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue