From patchwork Mon Apr 28 16:22:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 42107 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BDF7E27BC4A; Mon, 28 Apr 2025 17:33:02 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,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 942DB27BC49 for ; Mon, 28 Apr 2025 17:33:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9RPV-0007gI-SM; Mon, 28 Apr 2025 12:32:50 -0400 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 1u9ROs-0007aN-0H for guix-patches@gnu.org; Mon, 28 Apr 2025 12:32:11 -0400 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 1u9ROq-0004N9-Ea; Mon, 28 Apr 2025 12:32:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Pd9CF4JpsnVXQZFYIAM2YKfSrloC+nkUkDyeHbPPNkQ=; b=cw6JFNT9nZkaMmrzRjcO1jppTui4Bcg6y4zf0eqUTkEE3DBxbbIu6lZ1Nxy6CfrFxomLMlHXAIA+ebFla9xOZI6DtVtf8DYWFJcvG3ClT0eoYqT9Qwd6cYCg4FYxGmk/i7KLlbPNUjBMW0VHkYdMlFtWg2PZgtXdDu9Pl6LNQUVVwWf2w5fMRRdWM8oA7qRwyWOb3MBpZ8pmVqstegm9FMmcmWR/l/kNRuAy+97bWvkofqWvCrSILOrlylEE61eHv74w/A/G415nL5TcnxosltAoiMUezlvAt3oozZPoDabuJ8E7p6Rgh89FOC/vsfqwCGXiT/GKDfiqgC+aQ5IRXQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9ROm-0003G6-0L; Mon, 28 Apr 2025 12:32:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77093] [PATCH v4 rust-team 01/22] scripts: import: Correct behavior for =?utf-8?b?4oCYLS1pbnNlcnTigJk=?= option. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 28 Apr 2025 16:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77093 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77093@debbugs.gnu.org Cc: Hilton Chain , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 77093-submit@debbugs.gnu.org id=B77093.174585788312063 (code B ref 77093); Mon, 28 Apr 2025 16:32:03 +0000 Received: (at 77093) by debbugs.gnu.org; 28 Apr 2025 16:31:23 +0000 Received: from localhost ([127.0.0.1]:32812 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9RO7-00038R-BR for submit@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:23 -0400 Received: from mail.boiledscript.com ([49.12.134.184]:42942) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u9RO1-00037V-M3 for 77093@debbugs.gnu.org; Mon, 28 Apr 2025 12:31:19 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=mail; t=1745857875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pd9CF4JpsnVXQZFYIAM2YKfSrloC+nkUkDyeHbPPNkQ=; b=LYBMiEqBviQBuFC4vdTUYkgWn9Z8AHG7CjFGncAjgH9/SpsOD7maB8PWkgm2kE5ThxBwch pgG7HKQLDfvdEClSsuiGZPUSiGSm6jj4IaWJmEU4SSztOm+5QJCfgxbSQQhNmCfHUUeyEx JvGAiILNAlT5ow3cEQJBHStJvrSTCePc/2l6tp8V+6JiUfHujmqQg+Dp7feXU8xYmIqrhQ ndbVa/V0uWyc3EHdnu8doslKHZ3LZdIguC6F8wBd7vtOP8rcNGeeSTs+87Yr6JCR4UZ9u0 wFP/eHUxrVQ6IQD7CcT5J9819xdBNNcI58tllb3zpxJDI6qmrhFYcAOs0hvOng== Date: Tue, 29 Apr 2025 00:22:58 +0800 Message-ID: <8648da361beea558734c285e763d925dc7c97bc2.1745855744.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 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: , 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 The info manual documents ‘--insert=FILE’, but it wasn't actually supported. * guix/scripts/import.scm (show-help): Add missing ‘FILE’. (guix-import): Accept ‘--insert=FILE’. Change-Id: I540d5feae3fe49c00e9bd6f7a8649ffe0d6e006d --- guix/scripts/import.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index bbf31baa15..a85f6c6c49 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -69,7 +69,7 @@ (define (show-help) (display (G_ " -h, --help display this help and exit")) (display (G_ " - -i, --insert insert packages into file alphabetically")) + -i, --insert=FILE insert packages into FILE alphabetically")) (display (G_ " -V, --version display version information and exit")) (newline) @@ -106,7 +106,18 @@ (define-command (guix-import . args) (category packaging) (synopsis "import a package definition from an external repository") - (match args + (define (process-args args) + (match args + ;; Workaround to accpet ‘--insert=FILE’, for the consistency of + ;; command-line interface. + ((arg . rest) + (if (string-prefix? "--insert=" arg) + (append (string-split arg #\=) + rest) + args)) + (_ args))) + + (match (process-args args) (() (format (current-error-port) (G_ "guix import: missing importer name~%")))