diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-04 22:44:41 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-06 23:59:46 +0200 |
| commit | 35ca3cfbcf6018cee94c6f458a74cfd814747812 (patch) | |
| tree | 287d0728de8f51e874833d194dcee3cf23edf2f2 | |
| parent | b92cfc322d2f3ca55315861ecf89b3340788a5f3 (diff) | |
| download | guix-35ca3cfbcf6018cee94c6f458a74cfd814747812.tar guix-35ca3cfbcf6018cee94c6f458a74cfd814747812.tar.gz | |
upstream: 'package-latest-release' tries all the matching updaters.
* guix/upstream.scm (package-latest-release): Try UPDATERS until one of
them returns an upstream source. This is useful for packages with
several matching updaters, such a zlib ('sourceforge' and
'generic-html').
| -rw-r--r-- | guix/upstream.scm | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/guix/upstream.scm b/guix/upstream.scm index accd8967d8..632e9ebc4f 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -264,12 +264,15 @@ them matches." #:optional (updaters (force %updaters))) "Return an upstream source to update PACKAGE, a <package> object, or #f if -none of UPDATERS matches PACKAGE. It is the caller's responsibility to ensure -that the returned source is newer than the current one." - (match (lookup-updater package updaters) - ((? upstream-updater? updater) - ((upstream-updater-latest updater) package)) - (_ #f))) +none of UPDATERS matches PACKAGE. When several updaters match PACKAGE, try +them until one of them returns an upstream source. It is the caller's +responsibility to ensure that the returned source is newer than the current +one." + (any (match-lambda + (($ <upstream-updater> name description pred latest) + (and (pred package) + (latest package)))) + updaters)) (define* (package-latest-release* package #:optional |