From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sp3QCgW0wl+ZYAAA0tVLHw (envelope-from ) for ; Sat, 28 Nov 2020 20:33:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id qLtKBgW0wl+XXgAA1q6Kng (envelope-from ) for ; Sat, 28 Nov 2020 20:33:09 +0000 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 E12929402C8 for ; Sat, 28 Nov 2020 20:33:08 +0000 (UTC) Received: from localhost ([::1]:46722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kj6u3-0005tt-Sw for larch@yhetil.org; Sat, 28 Nov 2020 15:33:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kj6ty-0005tn-44 for guix-patches@gnu.org; Sat, 28 Nov 2020 15:33:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kj6tx-0006vP-RH for guix-patches@gnu.org; Sat, 28 Nov 2020 15:33:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kj6tx-00034Q-Ov for guix-patches@gnu.org; Sat, 28 Nov 2020 15:33:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44931] [PATCH 1/1] upgrade: Allow several regexps. References: <20201128202631.27734-1-zimon.toutoune@gmail.com> In-Reply-To: <20201128202631.27734-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Nov 2020 20:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44931 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44931@debbugs.gnu.org Cc: zimoun Received: via spool by 44931-submit@debbugs.gnu.org id=B44931.160659557611792 (code B ref 44931); Sat, 28 Nov 2020 20:33:01 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.17 X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=HtuAk1na; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-TUID: 8p+mThxZdcrW 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