From: zimoun <zimon.toutoune@gmail.com>
To: 44931@debbugs.gnu.org
Cc: zimoun <zimon.toutoune@gmail.com>
Subject: [bug#44931] [PATCH 1/1] upgrade: Allow several regexps.
Date: Sat, 28 Nov 2020 21:32:45 +0100 [thread overview]
Message-ID: <20201128203245.30190-1-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20201128202631.27734-1-zimon.toutoune@gmail.com>
Fixes <https://bugs.gnu.org/44928>.
Reported by Luis Felipe <luis.felipe.la@protonmail.com>.
* 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 <ludo@gnu.org>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune@gmail.com>
;;;
;;; 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
next prev parent reply other threads:[~2020-11-28 20:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-28 20:26 [bug#44931] [PATCH 0/1] upgrade: Allow several regexps (fix #44928) zimoun
2020-11-28 20:32 ` zimoun [this message]
2020-12-01 10:36 ` bug#44931: [PATCH 1/1] upgrade: Allow several regexps Mathieu Othacehe
2020-12-01 12:42 ` [bug#44931] " zimoun
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=20201128203245.30190-1-zimon.toutoune@gmail.com \
--to=zimon.toutoune@gmail.com \
--cc=44931@debbugs.gnu.org \
/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).