From unknown Sun Aug 17 09:09:46 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#44931 <44931@debbugs.gnu.org> To: bug#44931 <44931@debbugs.gnu.org> Subject: Status: [PATCH 0/1] upgrade: Allow several regexps (fix #44928). Reply-To: bug#44931 <44931@debbugs.gnu.org> Date: Sun, 17 Aug 2025 16:09:46 +0000 retitle 44931 [PATCH 0/1] upgrade: Allow several regexps (fix #44928). reassign 44931 guix-patches submitter 44931 zimoun severity 44931 normal tag 44931 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 28 15:26:46 2020 Received: (at submit) by debbugs.gnu.org; 28 Nov 2020 20:26:46 +0000 Received: from localhost ([127.0.0.1]:49178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kj6nu-0002ta-95 for submit@debbugs.gnu.org; Sat, 28 Nov 2020 15:26:46 -0500 Received: from lists.gnu.org ([209.51.188.17]:38922) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kj6nr-0002tS-E3 for submit@debbugs.gnu.org; Sat, 28 Nov 2020 15:26:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kj6nr-0002dd-6k for guix-patches@gnu.org; Sat, 28 Nov 2020 15:26:43 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:39690) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kj6np-0004t4-Ij for guix-patches@gnu.org; Sat, 28 Nov 2020 15:26:42 -0500 Received: by mail-wr1-x436.google.com with SMTP id e7so9479318wrv.6 for ; Sat, 28 Nov 2020 12:26:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eMlxRmzGNNys8nycchSj1AooB/tJaJpsHUKkk+ILKAM=; b=GaFtb0xMfw0IdApdayC1K17pyZ4q+72wrJaMP4v9tgnVqQ1r7cfhus+dacRJDDBkjG v2sm7WkJ2lK0+cS2OWZ3xMYDAutdyzE9zhvc6o5pX8XgSCle6PoneUDNAHBZv3rkTwCO 5pEdrXXzqYEoDp9jPgzLXPwkCW5lssowid6Z6E/w1DwiepVpYqGw5Q6Tn1R8mUlaWpCU wEZ2NoG+j4d9Ce+3tRRWznx4n8KfUWUbyVnNNjTPG9C7Iz+MLFK0o0Cnyzj2H9U4fg2B DDikTWLoYkvZ/NqDBtJdIPDdcl+4Ch1xHz48KRUqO2fmkbDO3CrXYvYf3LQLI07PL8IC Romw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=eMlxRmzGNNys8nycchSj1AooB/tJaJpsHUKkk+ILKAM=; b=F+Ak5drMbCghkN53sMXJZBSSRGvhow2aE/ODVTwprPbuo4WMCvwNIcD+ZD1x0wdCXl Sb98jMU5ypOdf1N6vK0Wr8mcD8THalVN0b9s9YWiMHaKjQN170XyrOe7SH6kcEY9escA 78+fE2HXilwZ+zhIMro/GrRHuUREcPApXarf07xPNx7njfGgEtCKYbKct2ZyQDlq99sx KML5eWMeA3oW/NGy9A82KlFU0+VTACbblRmhs0xjBtCq+NqRLadqWIqkNNqjbxF51RUL SXPjq6Y0CjcBUPE1bMG1v61IxphWi0ttatiXYAQeuOg/iGUCTpNOzT2FWbRdm2rEseLk bHXQ== X-Gm-Message-State: AOAM531tjKCaWAWxXTOjIoVYLEf4ngthHcA3B3UOA6OXwwvZJak+UIqD vkuBoq2rn+Ej/HrK6hbDBtHleTtasQhzAw== X-Google-Smtp-Source: ABdhPJzYx3iGKYb47kJF42Zm+wdSe06+yzuaRARkpgUF+PrglS9aiAsm3b5q2ZWmEN76zOegYdmhmA== X-Received: by 2002:adf:fd52:: with SMTP id h18mr19056200wrs.90.1606595199887; Sat, 28 Nov 2020 12:26:39 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id i11sm22077921wrm.1.2020.11.28.12.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 12:26:39 -0800 (PST) From: zimoun To: guix-patches@gnu.org Subject: [PATCH 0/1] upgrade: Allow several regexps (fix #44928). Date: Sat, 28 Nov 2020 21:26:31 +0100 Message-Id: <20201128202631.27734-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Dear, Fixes describing that the 2nd raises an error: $ guix upgrade foo bar guix upgrade: error: bar: extraneous argument And it is not the case with "guix package -u foo bar". I am not convinced by the patch but after thinking a bit, the 'match' does not seem necessary because the options are correctly handled by SRFI-37 and any extra term is potentially an other regexp. The 'opts' is correctly formed and then "guix-package" does all the job. Well, I have been too lazy to create something in the test suite; someone should do. :-) Testing "guix package --upgrade" and "guix upgrade". Maybe a v2 of this tiny patch? ;-) Feedback welcome. All the best, simon zimoun (1): upgrade: Allow several regexps. guix/scripts/upgrade.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) base-commit: 8ea2d7c2fa4d4ad7b4cf522fa259561beeeda072 -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Nov 28 15:32:56 2020 Received: (at 44931) by debbugs.gnu.org; 28 Nov 2020 20:32:56 +0000 Received: from localhost ([127.0.0.1]:49188 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kj6ts-000347-7z for submit@debbugs.gnu.org; Sat, 28 Nov 2020 15:32:56 -0500 Received: from mail-wr1-f48.google.com ([209.85.221.48]:37774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kj6tq-00033u-7w for 44931@debbugs.gnu.org; Sat, 28 Nov 2020 15:32:55 -0500 Received: by mail-wr1-f48.google.com with SMTP id i2so9481606wrs.4 for <44931@debbugs.gnu.org>; Sat, 28 Nov 2020 12:32:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NcYAVPh+oAOW1tyi8ivQGks7J2uIev8uJ1WJQEfEtIQ=; b=HtuAk1na+BahDUPUGeoOmWu+Ti0g0AovaKc/w5ycG3Dbh/RVLuEFy1ztF6AesRZ2+u EmP2PHDsWThX2cj82p9oKNTMehBlXTGjb4uUD4Ur6s79Jx6wnqjGIEcukmUSCD+ris5l gc0OiETmWF7pG29xJK+aYTTfFcUCsAjfZHS036EuahgaWspZiS2OB9BnaUWz1jU+JqOg 9K8r45HlBN60wL5YmHJ5wDO7MYVhU0nTYwazvPsqgO1ky+Fwmed5E2AGlaSkrkGs5Tp/ 3ZMA1Pl1uYY8wq9N0oxQPVbHl//qRzfY+xZS4Zzwqyjs3bnWzjo9pM1v0Vqv7wE+Uf9V COHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NcYAVPh+oAOW1tyi8ivQGks7J2uIev8uJ1WJQEfEtIQ=; b=Tl/zFBTfjkPOEObdo/vDpSGpdcE08e3Avj1sAIpZ16HfaFTt9oSRE0BBc32nJ03ncI Omjm9+Va8nNECUxS1DWaLnGxk2ZTOLQl5CzAbahxdfUYBLH75/X2Cl8/pFfLhQwf9UMN m8Ru6WqpgQkQWDyNdgP63AlpwDydi+Hm6qPkC7aOcOPXpHpsLMQwUUq/Iht8VhkKmRRR RZ+aJBxnpwFnSBr7xMDO7kKoO6koY7mDmFttuuzjrJXLRPglAw+d7UMNgBwplG9s73DC eEwySf8XRG+utByVRrKOSUndNL6ae5eIUzKsPj2CcihRULjYDJ049PJGfOhfzJITwUjG q9zg== X-Gm-Message-State: AOAM5318cOgh+oxD1QEKyWS6azR+ntQ7minKJ/Cv7XKh6/h6d6RM4hTq b62XTAmE5y2DKRzm/qZ1T4nyHxKDjnpB7A== X-Google-Smtp-Source: ABdhPJy5N8SKcivRqEmwDJlxNkkXCfahEfG8C6RQp6Bwgyl2UYFVdB98st1qRJ0ooMxk+ZizsJk4MQ== X-Received: by 2002:adf:f1d2:: with SMTP id z18mr20261945wro.244.1606595568063; Sat, 28 Nov 2020 12:32:48 -0800 (PST) Received: from localhost.localdomain ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id i11sm22101119wro.85.2020.11.28.12.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Nov 2020 12:32:47 -0800 (PST) From: zimoun To: 44931@debbugs.gnu.org Subject: [PATCH 1/1] upgrade: Allow several regexps. Date: Sat, 28 Nov 2020 21:32:45 +0100 Message-Id: <20201128203245.30190-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 44931 Cc: zimoun X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes . Reported by Luis Felipe . * guix/scripts/upgrade.scm (guix-upgrade): Allow several regexps and remove "extraneous arguement" check. --- guix/scripts/upgrade.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/guix/scripts/upgrade.scm b/guix/scripts/upgrade.scm index dcbcb2ab09..0eaae01e46 100644 --- a/guix/scripts/upgrade.scm +++ b/guix/scripts/upgrade.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2020 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,13 +77,9 @@ This is an alias for 'guix package -u'.\n")) (define (handle-argument arg result arg-handler) ;; Accept at most one non-option argument, and treat it as an upgrade ;; regexp. - (match (assq-ref result 'upgrade) - (#f - (values (alist-cons 'upgrade arg - (alist-delete 'upgrade result)) + (values (alist-cons 'upgrade arg + (delete '(upgrade . #f) result)) arg-handler)) - (_ - (leave (G_ "~A: extraneous argument~%") arg)))) (define opts (parse-command-line args %options -- 2.29.2 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 01 05:36:14 2020 Received: (at 44931-done) by debbugs.gnu.org; 1 Dec 2020 10:36:14 +0000 Received: from localhost ([127.0.0.1]:57980 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk314-0001yn-D7 for submit@debbugs.gnu.org; Tue, 01 Dec 2020 05:36:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk312-0001ya-Qj for 44931-done@debbugs.gnu.org; Tue, 01 Dec 2020 05:36:13 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51734) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kk30x-0004Gg-JL; Tue, 01 Dec 2020 05:36:07 -0500 Received: from [2a01:e0a:19b:d9a0:d91d:e880:959c:e46b] (port=50464 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kk30t-00043G-Cv; Tue, 01 Dec 2020 05:36:03 -0500 From: Mathieu Othacehe To: zimoun Subject: Re: [bug#44931] [PATCH 1/1] upgrade: Allow several regexps. References: <20201128202631.27734-1-zimon.toutoune@gmail.com> <20201128203245.30190-1-zimon.toutoune@gmail.com> Date: Tue, 01 Dec 2020 11:36:02 +0100 In-Reply-To: <20201128203245.30190-1-zimon.toutoune@gmail.com> (zimoun's message of "Sat, 28 Nov 2020 21:32:45 +0100") Message-ID: <87h7p53jal.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 44931-done Cc: 44931-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hey zimoun, > + (values (alist-cons 'upgrade arg > + (delete '(upgrade . #f) result)) I fixed the indentation and the matching commentary and pushed as 86971616c139597ffa9e20acc75533ff90176450. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 01 07:43:16 2020 Received: (at 44931-done) by debbugs.gnu.org; 1 Dec 2020 12:43:16 +0000 Received: from localhost ([127.0.0.1]:58199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk500-0007Qu-Ag for submit@debbugs.gnu.org; Tue, 01 Dec 2020 07:43:16 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:38005) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk4zx-0007Qh-Ng for 44931-done@debbugs.gnu.org; Tue, 01 Dec 2020 07:43:14 -0500 Received: by mail-wr1-f68.google.com with SMTP id p8so2424130wrx.5 for <44931-done@debbugs.gnu.org>; Tue, 01 Dec 2020 04:43:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=pzbsgZJj8hPB6Ny1RKqsZJbGkSWnpXqQNmi+yIn9vz8=; b=sZ3vJqR3CUtKzyafd82Z9oGZOe6vNyq6XvqzBOtrzJABxphsB1bTXtCGnz/VPQQV8c dJXzYsxWAOU8ylGCBq51zjX6WWFVOU3iKkqlCi3LyfB8PncBNlAcCkZRlvSpGYvw8vO6 ZT7z6h0jAfKd3TzIRbKgOpLzjndc4fnSvlxppqnKhxJWeAwCtW+EPCu3UehJNKch+Dgu nfE7WzXiZX27Rw7xmfXpbDjbcAhmPSmSD4hXceKEtv/fU2rwOGvNiQSgmFprn/NTCb8g UmmXaTjG9IITS0vhmykLH6XKhIU/Ygk6jJ4Svj6U7zE1rzpEZMH8JZT2Sa/NmEALASqw qMNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=pzbsgZJj8hPB6Ny1RKqsZJbGkSWnpXqQNmi+yIn9vz8=; b=IWfJa+iMayKnVgtXfG/x4P40+8SRgAG8loNJeMt0U8J+x3JRYe0NWlUhi4sLdMN2BC xPil4X3xAzF1BR1/2rnisPI+zbADKspNpi+jat9iDU7L6X4FlvnHO2MzcmUwbac+cngO JBmUy/TuRnFxqMzcBueVvA7hYBnLKQKEvlsmVJ+EQz3vRF4ziG+ta4tT2g2VM18Im29J bY2/GQaRKnmOHCfioOn+39Ou/9yuU7Z1AFAwyNAVHN0z6aGfnVsI/i5806Te0hb26p17 ceNPkQpNHMpKPp2VW8PS5leyKHFLpd6hGGyiUKJnjEYjkF4gNdbRm8aN3/aWuwfa2sx5 TRKA== X-Gm-Message-State: AOAM531ZCsTny99UCYKXNRT+UozmB8bjQwJZQljjviRtDSUUsgOBIxL0 DPadokls28eo5QATBbfun32ErS9meNj1fQ== X-Google-Smtp-Source: ABdhPJxlZJj0a5UrCOJvBCkHUrR1nI0CZII2oQpraiSR2CHcjB8Zruy78NP3yIONz+hN8hrSV7/+Ww== X-Received: by 2002:a5d:69d1:: with SMTP id s17mr3798159wrw.104.1606826587553; Tue, 01 Dec 2020 04:43:07 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id h15sm2929170wrw.15.2020.12.01.04.43.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 04:43:07 -0800 (PST) From: zimoun To: Mathieu Othacehe Subject: Re: [bug#44931] [PATCH 1/1] upgrade: Allow several regexps. In-Reply-To: <87h7p53jal.fsf@gnu.org> References: <20201128202631.27734-1-zimon.toutoune@gmail.com> <20201128203245.30190-1-zimon.toutoune@gmail.com> <87h7p53jal.fsf@gnu.org> Date: Tue, 01 Dec 2020 13:42:59 +0100 Message-ID: <86k0u1vgrw.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 44931-done Cc: 44931-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Mathieu, On Tue, 01 Dec 2020 at 11:36, Mathieu Othacehe wrote: >> + (values (alist-cons 'upgrade arg >> + (delete '(upgrade . #f) result)) > > I fixed the indentation and the matching commentary and pushed as > 86971616c139597ffa9e20acc75533ff90176450. It is weird: I should miss something in my workflow because it is the second time if not more that you fix the indentation. Anyway! Thank, simon From unknown Sun Aug 17 09:09:46 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 30 Dec 2020 12:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator