From patchwork Tue Feb 28 06:28:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 47477 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 E910416C35; Tue, 28 Feb 2023 06:29:10 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham 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 EE9C016BF5 for ; Tue, 28 Feb 2023 06:29:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pWtTz-0000d9-A6; Tue, 28 Feb 2023 01:29: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 1pWtTy-0000d0-7d for guix-patches@gnu.org; Tue, 28 Feb 2023 01:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWtTx-0002O0-Sa for guix-patches@gnu.org; Tue, 28 Feb 2023 01:29:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pWtTx-0001fo-Nd for guix-patches@gnu.org; Tue, 28 Feb 2023 01:29:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61864] [PATCH] scripts: expose 'allow-collisions' for 'guix install' Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Feb 2023 06:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61864 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61864@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16775657396421 (code B ref -1); Tue, 28 Feb 2023 06:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Feb 2023 06:28:59 +0000 Received: from localhost ([127.0.0.1]:49521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWtTv-0001fV-IC for submit@debbugs.gnu.org; Tue, 28 Feb 2023 01:28:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:47854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWtTr-0001fK-Uw for submit@debbugs.gnu.org; Tue, 28 Feb 2023 01:28:58 -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 1pWtTr-0000ce-Jd for guix-patches@gnu.org; Tue, 28 Feb 2023 01:28:55 -0500 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pWtTp-0002M8-Rb for guix-patches@gnu.org; Tue, 28 Feb 2023 01:28:55 -0500 Received: by mail-pl1-x635.google.com with SMTP id z2so9310070plf.12 for ; Mon, 27 Feb 2023 22:28:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=DQTnJa9DJZXxCHiACc0VMAvfRMHXwzSjYc5hlZOQkDY=; b=eTAYN9+6pQkq0hV/9/eFky6Lu68No7epZp2qKkZRUa53tFQyMpi5T/2kfoxkwKX/oJ NRt9P5EZivEn5BT5d6ElEnxakEH46wgRZycrqPwHZaPjL7A5ySneTVZ6firoy2mFFJ0L hSyKaYFGHtPHo3FJ8lXUiMWpkC4JcMOmm3d5+4gdML2ugyN08QcfqbDhKmAOaV1WtX8X O7iRBmPgYPPrtmOebEDRAcNhS5LBwsUzhPMRq6pL0RjHEETw5u/Y3tpB30DoFKlc+x/X 8iWoxixg+AwzY/yQpCYwsZRxDoidt7I/Yq5yTvPVYJnj+gApscM96LihHw53CoHbqxLr XmgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DQTnJa9DJZXxCHiACc0VMAvfRMHXwzSjYc5hlZOQkDY=; b=DqtL2rncyGaddBOtmx52lqmfbeik0GhhqzGVDDRojSe2wpraEHiJSu9TXZyr7NYWNV 7M+A0udAvsa8eHxWvh5V1rc3YAq1oMSWFWvV9hdbPpa4aE2PqF+SgRhER1JDLl4WdXP+ P5/wg8zb3NWjv5pgupuszZJu/2soYafLMKuP2p4kpEz4VG4SFH0IJrv/dvaI2Iex+0EC H8iSmbsV/OckLhwP6mVdBXkSnS4nQkhur9tH/YKguhCGaUwE0YRFHFAbGh+DD1p9uOvM uRlM0CHTqkjMDpGL1aXNyxE9furUGaK6cyW8ceb+/JkjfxFfQoxgVDzUvfpMMG5wScmS GMDA== X-Gm-Message-State: AO0yUKW2zi/UhHpgxNmKSxZbElbd3nCOt4Q805mStDWuhgKvsobPNokB +D2W1iPznZOeHFT7kT0pJbm9R6GFs+w= X-Google-Smtp-Source: AK7set/PgRjkeJXWLgUNYRT6f4xnh1k5fE3dp0BiS/dXb5HgKLDMac4xDpocU1RogJRTb2QZoeaweA== X-Received: by 2002:a17:902:bf41:b0:19a:b033:2bb1 with SMTP id u1-20020a170902bf4100b0019ab0332bb1mr1450138pls.44.1677565731959; Mon, 27 Feb 2023 22:28:51 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id ju11-20020a170903428b00b0019b9a075f1fsm1911422plb.80.2023.02.27.22.28.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 22:28:50 -0800 (PST) From: Andy Tai Date: Mon, 27 Feb 2023 22:28:46 -0800 Message-Id: <20230228062846.19516-1-atai@atai.org> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::635; envelope-from=lichengtai@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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 * guix/scripts/install.scm: 'allow-collisions' option of 'package' exposed for 'install' alias --- guix/scripts/install.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: cb0d8100b288b5b0d130820207db17764b7d2140 prerequisite-patch-id: 2ab0872d80951bb6f8df7bc8c4211f008a5cc6b8 prerequisite-patch-id: 1fa93a6e05a30a2a3a92d11ff1d7bdf7912e2724 prerequisite-patch-id: 8027f51c310a66f545421b43e1283ed516d41afc diff --git a/guix/scripts/install.scm b/guix/scripts/install.scm index 63e625f266..4ab64b5b54 100644 --- a/guix/scripts/install.scm +++ b/guix/scripts/install.scm @@ -34,6 +34,8 @@ (define (show-help) (display (G_ " -p, --profile=PROFILE use PROFILE instead of the user's default profile")) ;; '--bootstrap' not shown here. + (display (G_ " + --allow-collisions do not treat collisions in the profile as an error")) (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (newline) @@ -61,7 +63,8 @@ (define %options ;; Preserve some of the 'guix package' options. (append (filter (lambda (option) (any (cut member <> (option-names option)) - '("profile" "dry-run" "verbosity" "bootstrap"))) + '("profile" "dry-run" "verbosity" "bootstrap" + "allow-collisions"))) %package-options) %transformation-options