Message ID | 95a5752b5eddc03de508cbddcfdfbfec3c55b778.1708461547.git.herman@rimm.ee |
---|---|
State | New |
Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3D95327BBE9; Tue, 20 Feb 2024 20:47:22 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 4211D27BBE2 for <patchwork@mira.cbaines.net>; Tue, 20 Feb 2024 20:47:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1rcX11-00057y-2b; Tue, 20 Feb 2024 15:47: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 <Debian-debbugs@debbugs.gnu.org>) id 1rcX0n-000556-Tz for guix-patches@gnu.org; Tue, 20 Feb 2024 15:46:47 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1rcX0n-0004Gp-L7; Tue, 20 Feb 2024 15:46:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1rcX17-0004HU-5B; Tue, 20 Feb 2024 15:47:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68935] [PATCH v3 6/7] import: Discard args after --version and --help. Resent-From: Herman Rimm <herman@rimm.ee> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 20 Feb 2024 20:47:05 +0000 Resent-Message-ID: <handler.68935.B68935.170846199216362@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68935 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68935@debbugs.gnu.org Cc: ludo@gnu.org, Herman Rimm <herman@rimm.ee>, Christopher Baines <guix@cbaines.net>, Josselin Poiret <dev@jpoiret.xyz>, Ludovic =?utf-8?q?Court=C3=A8s?= <ludo@gnu.org>, Mathieu Othacehe <othacehe@gnu.org>, Ricardo Wurmus <rekado@elephly.net>, Simon Tournier <zimon.toutoune@gmail.com>, Tobias Geerinckx-Rice <me@tobias.gr> X-Debbugs-Original-Xcc: Christopher Baines <guix@cbaines.net>, Josselin Poiret <dev@jpoiret.xyz>, Ludovic =?utf-8?q?Court=C3=A8s?= <ludo@gnu.org>, Mathieu Othacehe <othacehe@gnu.org>, Ricardo Wurmus <rekado@elephly.net>, Simon Tournier <zimon.toutoune@gmail.com>, Tobias Geerinckx-Rice <me@tobias.gr> Received: via spool by 68935-submit@debbugs.gnu.org id=B68935.170846199216362 (code B ref 68935); Tue, 20 Feb 2024 20:47:05 +0000 Received: (at 68935) by debbugs.gnu.org; 20 Feb 2024 20:46:32 +0000 Received: from localhost ([127.0.0.1]:46817 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1rcX0a-0004Fl-24 for submit@debbugs.gnu.org; Tue, 20 Feb 2024 15:46:32 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:52067 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <herman@rimm.ee>) id 1rcX0K-0004Du-W8 for 68935@debbugs.gnu.org; Tue, 20 Feb 2024 15:46:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1708461944; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=//D2unqguqLgv4H/2VsZlZ6KSyS2GyTH7c3oA9GEgec=; b=DxAyx1vQaIIBhwqil/vr8mFxJMHMu2UAbEKPeO0iT2KgrtIhK84ea6nDseDDpxt+DIq4wo hhPoWJ+pzpd6yGfk2v89FpiT20uY3DweIg0IuP7MfosuTpXLeYOJQvxHizIXppJdShqO/7 OUlMkJ1jcci2j89TcwyGKIscJsNjGS86pm376zea2crC6ykeFSf2GICGWEGZFvfHMOYoqV PKNFICBaM3bdD5s2qhRs5n1KwOuc+Cw83n8F+GLVTpwqtks4g/YqJemLtnANNAZnJ3+cjU RQAOOoh6Zb10JnjQBc8apY6+T4MxjSwSSNvej3wKAn3PGIPAWVqD1Mbo6FGVUg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 610b92fb (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 20 Feb 2024 20:45:44 +0000 (UTC) Date: Tue, 20 Feb 2024 21:45:14 +0100 Message-ID: <95a5752b5eddc03de508cbddcfdfbfec3c55b778.1708461547.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1708461547.git.herman@rimm.ee> References: <cover.1708461547.git.herman@rimm.ee> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Reply-to: Herman Rimm <herman@rimm.ee> X-ACL-Warn: , Herman Rimm via Guix-patches <guix-patches@gnu.org> From: Herman Rimm via Guix-patches via <guix-patches@gnu.org> 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 |
Series |
Add insert option to guix import.
|
expand
|
diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index aca4e61f26..1f34cab088 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -108,10 +108,10 @@ (define-command (guix-import . args) (() (format (current-error-port) (G_ "guix import: missing importer name~%"))) - ((or ("-h") ("--help")) + ((or ("-h" _ ...) ("--help" _ ...)) (leave-on-EPIPE (show-help)) (exit 0)) - ((or ("-V") ("--version")) + ((or ("-V" _ ...) ("--version" _ ...)) (show-version-and-exit "guix import")) ((or ("-i" file importer args ...) ("--insert" file importer args ...))