From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id uGirFdkP1WUzpgAAqHPOHw:P1 (envelope-from ) for ; Tue, 20 Feb 2024 21:47:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id uGirFdkP1WUzpgAAqHPOHw (envelope-from ) for ; Tue, 20 Feb 2024 21:47:21 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=DxAyx1vQ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1708462041; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=//D2unqguqLgv4H/2VsZlZ6KSyS2GyTH7c3oA9GEgec=; b=gQVKTeBK0r+LvqRKJMsYCL+mdhbYFlxkAa8hupT6IKZQEi1FdQ/nCkV8m9kkExNbxlux3I OG92MoOE0AiGI2VrdghRJC1HQysmC5joJ0y0V3FqGMhtYz+hBDe3C7fW+fDid3VURiHCl5 QDBca4YHXxynNVguG6tmBpB3oQ9Nvl/s/kSLMzt9KHYBHDNOEE5Plv3OSMB7pT3YJnv15X UB+ftRF1IbrwlH1Tk+jAlc4U9Z14eao+ypwqXFZRk0q78Nbc1ob50in93XMiHVa/NeTz3n 2o5AzmJ91vNXXVtMfkaSEQeQwv7f8JQE3FmE7lubBCp08ViAb3/GnswEqvpekw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=DxAyx1vQ; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1708462041; a=rsa-sha256; cv=none; b=GWHTzLtzOsUtqkR+8HTFuAGMKmrVLtzhE6vEkhFavxodu61jLIfEKGiouSpaJgSbaKAA1n 8LB9844thPG0fJO01aN1qaL4AHJvFp9ZzhVG5sq2hYHaBGOufEJaOPjMxBR24Ggj59yqlm gusvhszMwvCGA53I+JUj9xDuxZnT8V5sJVpE9pbhHHxNCwML+m7GMvrmBbpF/t3SNE9HFr o5QltQjuopP+4V+qUEUNwBmbqoBgGm1RlIyAy91My0BrYDCrerj4hbpir4Kk1LcFcvx7Oo pKd691Cn43RgnIBVTZoUx7eF0qq7eBxYcadW4XS9LftpUXgLs5k/hAFO+Xqlvw== 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 4226A245CE for ; Tue, 20 Feb 2024 21:47:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" 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: 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 , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice 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 ) 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 ) 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: References: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.98 X-Spam-Score: -4.98 X-Migadu-Queue-Id: 4226A245CE X-TUID: aZohR7QLZwNs * guix/scripts/import.scm (guix-import): Discard args. Change-Id: Icce5cd0daf9011f7ddde7904113b31b547f063ef --- guix/scripts/import.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ...)) -- 2.41.0