From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 6KlnBg9RrGTmPgEASxT56A (envelope-from ) for ; Mon, 10 Jul 2023 20:42:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CIFmBg9RrGTGMwEA9RJhRA (envelope-from ) for ; Mon, 10 Jul 2023 20:42:23 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 436883BFDA for ; Mon, 10 Jul 2023 20:42:22 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=OQMMPJ2F; dmarc=none; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1689014543; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Xw6QI5nNd2t3n92f+wyp4nfcK+OxxwUPx3sKsnswREw=; b=mMvippQGSjKqJySJn8zjYPsANMmtbWCK27CvJ5+zzZrIPfzoJ6SUrK3+Lf/47nyrNR1jj4 Y2mL40Q5h7T767vsuW+pqJLrATdDfoa100N99X8oNcRpLf1xW5CdDqGUekMohKmO4YbMGr irIfFWqBzIYggF6iqCMiSyO88HcuWZRks7DVsVXQ8k53cdMaPCLD/BGJnSe+rCKILJ40G2 gILbgN40UUiJ/QBK53tqXH9wu/YV5vH2JFwMi6sYMMJwCLDNUq3wCIv/oaimjllIBASk79 oH29BnrPxLkSOUSGTbFDd6ILb83m0rDBc38zoJvP4Xmo1zYIy41u8Vt/H8nBwQ== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=elephly.net header.s=zoho header.b=OQMMPJ2F; dmarc=none; arc=reject ("signature check failed: fail, {[1] = sig:zohomail.com:reject}"); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=2; s=key1; d=yhetil.org; t=1689014543; a=rsa-sha256; cv=fail; b=Irrs3vhL3uoZFst6C5Uq8JjAcRpfy4jibm4wTs9Q2xlyYTkEFMrkZX8QLsiBrvXqItddPQ SAzco5tHHLlqGUaz0MJcdmXSQ1Bk/6sVk/Jv/YYGr4MFqWaZsQIUMQjzgTGIo6Yxu4u6s+ TsAyciFPzJ8WD4RnzRugq6ha79xtnAES2iCwxEHk6TKR2/AL6FYAvvGwDGQ+/DhPZMHome zJzu8OJRdBTqn5HSBzpwpe8FYVU32Sw2sIqEmCrN/fjf604WkAsiracFcPpK6aL7/BVFrl lfetNAQhcOmnwT95a0xvY4z3i3qD13CBdHYJCdxTx/K64onRpveQ7IOkXdwo5g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIvpq-0006Gq-Uw; Mon, 10 Jul 2023 14:42:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qIvpl-0006GD-NZ for bug-guix@gnu.org; Mon, 10 Jul 2023 14:42:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qIvpl-0000Ec-9D; Mon, 10 Jul 2023 14:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qIvpi-0002v9-5E; Mon, 10 Jul 2023 14:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#64358: [PATCH] refresh: Sort update specs by package location. References: <87bkgyklbv.fsf@elephly.net> In-Reply-To: <87bkgyklbv.fsf@elephly.net> Resent-From: Ricardo Wurmus Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, bug-guix@gnu.org Resent-Date: Mon, 10 Jul 2023 18:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64358 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 64358@debbugs.gnu.org Cc: Ricardo Wurmus , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 64358-submit@debbugs.gnu.org id=B64358.168901451511215 (code B ref 64358); Mon, 10 Jul 2023 18:42:02 +0000 Received: (at 64358) by debbugs.gnu.org; 10 Jul 2023 18:41:55 +0000 Received: from localhost ([127.0.0.1]:49125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIvpa-0002uo-LQ for submit@debbugs.gnu.org; Mon, 10 Jul 2023 14:41:55 -0400 Received: from sender4-of-o50.zoho.com ([136.143.188.50]:21007) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIvpX-0002uc-S3 for 64358@debbugs.gnu.org; Mon, 10 Jul 2023 14:41:53 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1689014508; cv=none; d=zohomail.com; s=zohoarc; b=MW4GMEtXDg0TO+fKavmgVl2ViEOc5aK9iu0ZWTjy4qGsaXqT+xFrdCBqvpG2/fff+7CQoPPDL8GxmOlChwl1NBksRCHkK0NzeAJQkdyDD/5KmfVCR7lUocS5cEfiU9AF4tUSm9VraZUDLUpJbT2rewbAMeUHnsEWNZi49oTjOmo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689014508; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=Xw6QI5nNd2t3n92f+wyp4nfcK+OxxwUPx3sKsnswREw=; b=Exw+seFIus3V8ziALXtxgWMHP9vi6oS6V2xRmDqOa/445+IvF/BQildOQ3AQ4amYgiOi+O8DzDEvAilzYY1Xo+bEF5qc8MZKy2v0UMNr1NnaRA1Uzq+wKBTVhT/HUytnYsHWI06mBzE64F1rY2C+9pv8fOpR58DwOT2aSSBw2o0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=elephly.net; spf=pass smtp.mailfrom=rekado@elephly.net; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1689014508; s=zoho; d=elephly.net; i=rekado@elephly.net; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:MIME-Version:Content-Type:Content-Transfer-Encoding:Reply-To; bh=Xw6QI5nNd2t3n92f+wyp4nfcK+OxxwUPx3sKsnswREw=; b=OQMMPJ2FbKMS+e+/iIutfnhTUUPZfXdRqFuSTnkmEkksC+uiMIjzU5zYZluXcVdm MZbaBLocU6bZiAGEw4T363umAhpFEoxxqbYOLsLFGbYaH5tvSvVFa8aKdG+/4whhqQb sW50I5iJpPV1DMmCHgBB5NScDP9Nz6hDsB2IaXjM= Received: from localhost (92-108-142-46.pool.kielnet.net [46.142.108.92]) by mx.zohomail.com with SMTPS id 1689014507079272.883472741977; Mon, 10 Jul 2023 11:41:47 -0700 (PDT) From: Ricardo Wurmus Date: Mon, 10 Jul 2023 20:41:41 +0200 Message-Id: <74997f913e60491d74afcea38a13e5edb0c71b09.1689014499.git.rekado@elephly.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -0.29 X-Migadu-Queue-Id: 436883BFDA X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: -0.29 X-TUID: ACyEHsFcIvqZ Fixes . * 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 ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2018 Efraim Flashner -;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2019, 2023 Ricardo Wurmus ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Hartmut Goebel @@ -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