guix-commits
[Top][All Lists]
Advanced

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

01/18: Revert "upstream: 'package-update' reports "unknown upstream rele


From: guix-commits
Subject: 01/18: Revert "upstream: 'package-update' reports "unknown upstream releases" errors."
Date: Fri, 1 Jul 2022 18:17:25 -0400 (EDT)

rekado pushed a commit to branch wip-r
in repository guix.

commit 149acba797e4ba54282e780855405b81afc74332
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Jul 1 23:34:01 2022 +0200

    Revert "upstream: 'package-update' reports "unknown upstream releases" 
errors."
    
    This reverts commit 53b9c27aa59bebf955f0aa24fef60a101480ef5c.
---
 guix/upstream.scm | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/guix/upstream.scm b/guix/upstream.scm
index dac8153905..b0f77fb7d0 100644
--- a/guix/upstream.scm
+++ b/guix/upstream.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2010-2022 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 
2020, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2019, 2022 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@@ -488,36 +488,30 @@ SOURCE, an <upstream-source>."
                          #:optional (updaters (force %updaters))
                          #:key (key-download 'interactive))
   "Return the new version, the file name of the new version tarball, and input
-changes for PACKAGE; return #f (three values) when PACKAGE is up-to-date;
-raise an error when the updater could not determine available releases.
+changes for PACKAGE; return #f (three values) when PACKAGE is up-to-date.
 KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed
 values: 'always', 'never', and 'interactive' (default)."
-  (match (package-latest-release package updaters)
+  (match (package-latest-release* package updaters)
     ((? upstream-source? source)
-     (if (version>? (upstream-source-version source)
-                    (package-version package))
-         (let ((method (match (package-source package)
-                         ((? origin? origin)
-                          (origin-method origin))
-                         (_
-                          #f))))
-           (match (assq method %method-updates)
-             (#f
-              (raise (make-compound-condition
-                      (formatted-message (G_ "cannot download for \
+     (let ((method (match (package-source package)
+                     ((? origin? origin)
+                      (origin-method origin))
+                     (_
+                      #f))))
+       (match (assq method %method-updates)
+         (#f
+          (raise (make-compound-condition
+                  (formatted-message (G_ "cannot download for \
 this method: ~s")
-                                         method)
-                      (condition
-                       (&error-location
-                        (location (package-location package)))))))
-             ((_ . update)
-              (update store package source
-                      #:key-download key-download))))
-         (values #f #f #f)))
+                                     method)
+                  (condition
+                   (&error-location
+                    (location (package-location package)))))))
+         ((_ . update)
+          (update store package source
+                  #:key-download key-download)))))
     (#f
-     (raise (formatted-message
-             (G_ "updater failed to determine available releases for ~a~%")
-             (package-name package))))))
+     (values #f #f #f))))
 
 (define* (update-package-source package source hash)
   "Modify the source file that defines PACKAGE to refer to SOURCE, an



reply via email to

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