From: Ricardo Wurmus <rekado@elephly.net>
To: 64358@debbugs.gnu.org
Cc: "Ricardo Wurmus" <rekado@elephly.net>,
"Christopher Baines" <mail@cbaines.net>,
"Josselin Poiret" <dev@jpoiret.xyz>,
"Ludovic Courtès" <ludo@gnu.org>,
"Mathieu Othacehe" <othacehe@gnu.org>,
"Ricardo Wurmus" <rekado@elephly.net>,
"Simon Tournier" <zimon.toutoune@gmail.com>,
"Tobias Geerinckx-Rice" <me@tobias.gr>
Subject: bug#64358: [PATCH] refresh: Sort update specs by package location.
Date: Mon, 10 Jul 2023 20:41:41 +0200 [thread overview]
Message-ID: <74997f913e60491d74afcea38a13e5edb0c71b09.1689014499.git.rekado@elephly.net> (raw)
In-Reply-To: <87bkgyklbv.fsf@elephly.net>
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.
---
guix/scripts/refresh.scm | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 9676271542..7a0c312f9d 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 @@ (define-command (guix-refresh . args)
(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* ((get-line
+ (compose location-line
+ 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) (> (get-line a) (get-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
base-commit: d0296970fb8ed97ac17bd4c580351af961a8c0fb
--
2.40.1
next prev parent reply other threads:[~2023-07-10 18:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-29 21:26 bug#64358: “guix refresh” chokes on cran.scm Ricardo Wurmus
[not found] ` <handler.64358.B.168807427428659.ack@debbugs.gnu.org>
2023-07-03 19:29 ` Ricardo Wurmus
2023-07-07 13:42 ` Ludovic Courtès
2023-07-07 20:13 ` Ricardo Wurmus
2023-07-10 18:41 ` Ricardo Wurmus [this message]
2023-07-10 21:49 ` bug#64358: [PATCH] refresh: Sort update specs by package location Ludovic Courtès
2023-07-10 22:17 ` Ricardo Wurmus
2023-07-14 13:19 ` Ludovic Courtès
2023-07-12 12:35 ` bug#64358: “guix refresh” chokes on cran.scm Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=74997f913e60491d74afcea38a13e5edb0c71b09.1689014499.git.rekado@elephly.net \
--to=rekado@elephly.net \
--cc=64358@debbugs.gnu.org \
--cc=dev@jpoiret.xyz \
--cc=ludo@gnu.org \
--cc=mail@cbaines.net \
--cc=me@tobias.gr \
--cc=othacehe@gnu.org \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).