From patchwork Tue Dec 27 22:21:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 45612 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CC88C27BBEB; Tue, 27 Dec 2022 22:22:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C344027BBE9 for ; Tue, 27 Dec 2022 22:22:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAIKh-0001IZ-AQ; Tue, 27 Dec 2022 17:22:03 -0500 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 1pAIKg-0001IC-JP for guix-patches@gnu.org; Tue, 27 Dec 2022 17:22:02 -0500 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 1pAIKg-00056D-0y for guix-patches@gnu.org; Tue, 27 Dec 2022 17:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAIKf-0000nk-KG for guix-patches@gnu.org; Tue, 27 Dec 2022 17:22:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60368] [PATCH 1/2] refresh: Honor user-provided target version and report downgrades. References: <20221227221156.25323-1-ludo@gnu.org> In-Reply-To: <20221227221156.25323-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Dec 2022 22:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60368@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 60368-submit@debbugs.gnu.org id=B60368.16721796923037 (code B ref 60368); Tue, 27 Dec 2022 22:22:01 +0000 Received: (at 60368) by debbugs.gnu.org; 27 Dec 2022 22:21:32 +0000 Received: from localhost ([127.0.0.1]:56674 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAIKC-0000mt-Cm for submit@debbugs.gnu.org; Tue, 27 Dec 2022 17:21:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAIKA-0000mc-OL for 60368@debbugs.gnu.org; Tue, 27 Dec 2022 17:21:31 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAIK3-00055J-Pl; Tue, 27 Dec 2022 17:21:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=TjbmETniyiSXwK7lDFsgWSt3htyC70oQrUczU849US8=; b=PodQVBoY478WW9 Qj5qVvse6iASO2QQBQ/aBcFv3AqJeVM3347lLb6qZC3Oa7ylSUx5bnYmyKcfFRpa8czdTvqiEuHoC 7ZqKPni1aOoiIEjMyxd4Z63ZcTZJ9gR+qZwQ/xIKzKNjANGqn0ONzKr3xIo1y/upiKnCkpgSEDbmO ua13ngEjoTLFEwDiMHZnkZrqhSMKUuDpiBQTYR693EtHG9a3oj47DfJGsSkYRO1kPEbmWeovoLmCR zy0F2uyKQvVoRQe96umdRmniHaYNp1jJpyRvFrBYpJ4V1h2PNhmuoz+fmmWsjGmxc3jn7sPXnGfAH Uc1g6GS/+OJ7yD0ogRPQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAIK3-0003SH-Aq; Tue, 27 Dec 2022 17:21:23 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 27 Dec 2022 23:21:09 +0100 Message-Id: <20221227222110.25440-1-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Previously, 'guix refresh guile=3.0.0' would print: 3.0.8 is already the latest version of guile With this change, it prints: guile would be downgraded from 3.0.8 to 3.0.0 This is a followup to 8aeccc6240ec45f0bc7bed655e0c8149ae4253eb. * guix/scripts/refresh.scm (check-for-package-update): Take an instead of a . Report downgrades as such when UPDATE-SPEC specifies a target version. (guix-refresh): Adjust caller. --- guix/scripts/refresh.scm | 46 +++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index e0b94ce48d..65c3ce9c16 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -382,10 +382,15 @@ (define change-name (when warn? (warn-no-updater package)))) -(define* (check-for-package-update package updaters #:key warn?) - "Check whether an update is available for PACKAGE and print a message. When -WARN? is true and no updater exists for PACKAGE, print a warning." - (match (package-latest-release package updaters) +(define* (check-for-package-update update-spec updaters #:key warn?) + "Check whether UPDATE-SPEC is feasible, and print a message. +When WARN? is true and no updater exists for PACKAGE, print a warning." + (define package + (update-spec-package update-spec)) + + (match (package-latest-release package updaters + #:version + (update-spec-version update-spec)) ((? upstream-source? source) (let ((loc (or (package-field-location package 'version) (package-location package)))) @@ -403,23 +408,34 @@ (define* (check-for-package-update package updaters #:key warn?) (package-version package) (package-name package)))) (else - (when warn? - (warning loc - (G_ "~a is greater than \ + (if (update-spec-version update-spec) + (info loc + (G_ "~a would be downgraded from ~a to ~a~%") + (package-name package) + (package-version package) + (upstream-source-version source)) + (when warn? + (warning loc + (G_ "~a is greater than \ the latest known version of ~a (~a)~%") - (package-version package) - (package-name package) - (upstream-source-version source))))))) + (package-version package) + (package-name package) + (upstream-source-version source)))))))) (#f (when warn? ;; Distinguish between "no updater" and "failing updater." (match (lookup-updater package updaters) ((? upstream-updater? updater) - (warning (package-location package) - (G_ "'~a' updater failed to determine available \ + (if (update-spec-version update-spec) + (warning (G_ "'~a' updater failed to find version ~a of '~a'~%") + (upstream-updater-name updater) + (update-spec-version update-spec) + (package-name package)) + (warning (package-location package) + (G_ "'~a' updater failed to determine available \ releases for ~a~%") - (upstream-updater-name updater) - (package-name package))) + (upstream-updater-name updater) + (package-name package)))) (#f (warn-no-updater package))))))) @@ -591,5 +607,5 @@ (define (options->updaters opts) (else (for-each (cut check-for-package-update <> updaters #:warn? warn?) - (map update-spec-package update-specs)) + update-specs) (return #t))))))))) From patchwork Tue Dec 27 22:21:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 45611 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6D26327BBEB; Tue, 27 Dec 2022 22:22:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B5B8B27BBE9 for ; Tue, 27 Dec 2022 22:22:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAIKi-0001Ip-05; Tue, 27 Dec 2022 17:22:04 -0500 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 1pAIKg-0001IE-Jw for guix-patches@gnu.org; Tue, 27 Dec 2022 17:22:02 -0500 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 1pAIKg-00056F-6e for guix-patches@gnu.org; Tue, 27 Dec 2022 17:22:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAIKg-0000ns-1p for guix-patches@gnu.org; Tue, 27 Dec 2022 17:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60368] [PATCH 2/2] upstream: Allow downgrades. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Dec 2022 22:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60368@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 60368-submit@debbugs.gnu.org id=B60368.16721796933043 (code B ref 60368); Tue, 27 Dec 2022 22:22:02 +0000 Received: (at 60368) by debbugs.gnu.org; 27 Dec 2022 22:21:33 +0000 Received: from localhost ([127.0.0.1]:56676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAIKC-0000mw-Pc for submit@debbugs.gnu.org; Tue, 27 Dec 2022 17:21:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAIKA-0000mb-Cx for 60368@debbugs.gnu.org; Tue, 27 Dec 2022 17:21:31 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pAIK4-00055N-9e; Tue, 27 Dec 2022 17:21:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=fEiHQrtooIDzwnNd7vJxs1+WZDS3XOdroU0YuHCVb68=; b=hcD6ppNX3cqMOcnf0p4B pY/hBxvyMjBxh67HdCJRIodW6QPaA0j5EOAdV1sUP38ATCcrYEjmw7r6Su2TCzf778yXWJTiqjLuD RHlzkRtRPNSXkW8M/B48CmLg5YSlPMeIgb1fS3N1GRcXeMUjqu5FoM+koXEHrOeOnORQwea2gwUUI vTYkFREqIJ0T+7i+Uym9nklPKJczR0xKWrLN8ur2WEGpPOcGear4lyxdVMYGrlSzmWIUDLzq0T8mz bLhq1gDX9zJ0iq+b5IVqY4P67lKfUDjASotwpA4FFI/TaQ6XBjhyPUC1pR6FIfaoTNaGqyYaoLgJ+ /5AzwOm/k8PrAw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAIK3-0003SH-U9; Tue, 27 Dec 2022 17:21:24 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Tue, 27 Dec 2022 23:21:10 +0100 Message-Id: <20221227222110.25440-2-ludo@gnu.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221227222110.25440-1-ludo@gnu.org> References: <20221227222110.25440-1-ludo@gnu.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Previously, 'guix refresh -u guile=3.0.0' would do nothing. With this change, it actually downgrades 'guile'. This is a followup to 8aeccc6240ec45f0bc7bed655e0c8149ae4253eb. * guix/upstream.scm (package-update): Ignore 'version>?' check when #:version is passed. Warn about downgrades. --- guix/upstream.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index f3ab9ab78b..4c72388bf3 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -501,11 +501,22 @@ (define* (package-update store package changes for PACKAGE; return #f (three values) when PACKAGE is up-to-date; raise an error when the updater could not determine available releases. KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed -values: 'always', 'never', and 'interactive' (default)." +values: 'always', 'never', and 'interactive' (default). + +When VERSION is specified, update PACKAGE to that version, even if that is a +downgrade." (match (package-latest-release package updaters #:version version) ((? upstream-source? source) - (if (version>? (upstream-source-version source) - (package-version package)) + (if (or (version>? (upstream-source-version source) + (package-version package)) + (and version + (begin + (warning (package-location package) + (G_ "downgrading '~a' from ~a to ~a~%") + (package-name package) + (package-version package) + (upstream-source-version source)) + #t))) (let ((method (match (package-source package) ((? origin? origin) (origin-method origin))