nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

upstream: 'package-update' returns the <upstream-source> object. 

Fixes a regression introduced in
abd4d6b33d, where CHANGES would no longer
be a thunk.

Reported by Ricardo Wurmus.

* guix/upstream.scm (package-update/url-fetch): Return SOURCE as the
third value instead of CHANGES.
* guix/scripts/refresh.scm (update-package): Adjust accordingly.
This commit is contained in:
Ludovic Courtès 2019-03-27 14:42:07 +01:00
parent 18c51cf3d3
commit 1ee3d2dcb8
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/scripts/refresh.scm
View File

@ -297,7 +297,7 @@ KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed
values: 'interactive' (default), 'always', and 'never'. When WARN? is true, values: 'interactive' (default), 'always', and 'never'. When WARN? is true,
warn about packages that have no matching updater." warn about packages that have no matching updater."
(if (lookup-updater package updaters) (if (lookup-updater package updaters)
(let-values (((version tarball changes) (let-values (((version tarball source)
(package-update store package updaters (package-update store package updaters
#:key-download key-download)) #:key-download key-download))
((loc) ((loc)
@ -330,7 +330,7 @@ warn about packages that have no matching updater."
(G_ "~a: consider removing this propagated input: ~a~%"))) (G_ "~a: consider removing this propagated input: ~a~%")))
(package-name package) (package-name package)
(upstream-input-change-name change))) (upstream-input-change-name change)))
(changes)) (upstream-source-input-changes source))
(let ((hash (call-with-input-file tarball (let ((hash (call-with-input-file tarball
port-sha256))) port-sha256)))
(update-package-source package version hash))) (update-package-source package version hash)))

6
guix/upstream.scm
View File

@ -344,10 +344,10 @@ values: the item from LST1 and the item from LST2 that match PRED."
(define* (package-update/url-fetch store package source (define* (package-update/url-fetch store package source
#:key key-download) #:key key-download)
"Return the version, tarball, and input changes needed to update PACKAGE to "Return the version, tarball, and SOURCE, to update PACKAGE to
SOURCE, an <upstream-source>." SOURCE, an <upstream-source>."
(match source (match source
(($ <upstream-source> _ version urls signature-urls changes) (($ <upstream-source> _ version urls signature-urls)
(let*-values (((archive-type) (let*-values (((archive-type)
(match (and=> (package-source package) origin-uri) (match (and=> (package-source package) origin-uri)
((? string? uri) ((? string? uri)
@ -371,7 +371,7 @@ SOURCE, an <upstream-source>."
(or signature-urls (circular-list #f))))) (or signature-urls (circular-list #f)))))
(let ((tarball (download-tarball store url signature-url (let ((tarball (download-tarball store url signature-url
#:key-download key-download))) #:key-download key-download)))
(values version tarball changes)))))) (values version tarball source))))))
(define %method-updates (define %method-updates
;; Mapping of origin methods to source update procedures. ;; Mapping of origin methods to source update procedures.