summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2023-07-10 20:37:55 +0200
committerRicardo Wurmus <rekado@elephly.net>2023-07-12 14:29:01 +0200
commitb43841c124d15eaecc41b3928f08a26dbd5c653a (patch)
treec2f48fdfd69e06ca41ae518af20e7168746bbd2e /guix
parent4a027d2b0ee68e39f21f6802a8cd1751d3065330 (diff)
refresh: Sort update specs by package location.
Fixes <https://issues.guix.gnu.org/64358>. * guix/scripts/refresh.scm (guix-refresh): Sort update specs by location from bottom to top before updating packages.
Diffstat (limited to 'guix')
-rw-r--r--guix/scripts/refresh.scm33
1 files changed, 22 insertions, 11 deletions
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 9676271542..f5cb18af22 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2019, 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -589,16 +589,27 @@ all are dependent packages: ~{~a~^ ~}~%")
(or (assoc-ref opts 'keyring)
(string-append (config-directory)
"/upstream/trustedkeys.kbx"))))
- (for-each
- (lambda (update)
- (update-package store
- (update-spec-package update)
- (update-spec-version update)
- updaters
- #:key-server (%openpgp-key-server)
- #:key-download key-download
- #:warn? warn?))
- update-specs)
+ (let* ((spec-line
+ (compose location->string
+ package-location
+ update-spec-package))
+ ;; Sort the specs so that we update packages from the
+ ;; bottom of the file to the top. This way we can be
+ ;; sure that the package locations are always correct
+ ;; and never shifted due to previous edits.
+ (sorted-update-specs
+ (sort update-specs
+ (lambda (a b) (string> (spec-line a) (spec-line b))))))
+ (for-each
+ (lambda (update)
+ (update-package store
+ (update-spec-package update)
+ (update-spec-version update)
+ updaters
+ #:key-server (%openpgp-key-server)
+ #:key-download key-download
+ #:warn? warn?))
+ sorted-update-specs))
(return #t)))
(else
(for-each (cut check-for-package-update <> updaters