From patchwork Thu Mar 2 06:49:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 47524 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 A6D4716CEF; Thu, 2 Mar 2023 06:50:24 +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 821AD16CC5 for ; Thu, 2 Mar 2023 06:50:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXclT-0003Di-6l; Thu, 02 Mar 2023 01:50:08 -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 1pXclO-0003Cl-JC for guix-patches@gnu.org; Thu, 02 Mar 2023 01:50:03 -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 1pXclO-0006re-9v for guix-patches@gnu.org; Thu, 02 Mar 2023 01:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pXclO-0001Nx-5W for guix-patches@gnu.org; Thu, 02 Mar 2023 01:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61907] [PATCH] scripts: Expose 'allow-collisions' for 'guix upgrade' Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2023 06:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61907 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61907@debbugs.gnu.org Cc: Andy Tai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16777397845290 (code B ref -1); Thu, 02 Mar 2023 06:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Mar 2023 06:49:44 +0000 Received: from localhost ([127.0.0.1]:55611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXcl5-0001NF-NH for submit@debbugs.gnu.org; Thu, 02 Mar 2023 01:49:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:51202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pXcl3-0001N7-Tc for submit@debbugs.gnu.org; Thu, 02 Mar 2023 01:49:42 -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 1pXcl0-00031t-Qb for guix-patches@gnu.org; Thu, 02 Mar 2023 01:49:39 -0500 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXckz-0006oh-2v for guix-patches@gnu.org; Thu, 02 Mar 2023 01:49:38 -0500 Received: by mail-pj1-x102a.google.com with SMTP id x34so15921625pjj.0 for ; Wed, 01 Mar 2023 22:49:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677739775; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=ZVLwX4/1xFXlWKrQ4yvKTTpd60WlUVF7Li1hvaAaZXc=; b=Ug+IWltqvr/TUGIKFPShWk9EBMofy46p3zsOzBIdWMDYzygMEyEHpUMfGEwupaaL/J zTmXnbq+5O/HjiSbI02DybhQRz5FBo81uDLZf+fxNTgLRjA0ac0WLdZvdInxw7aVPkuJ pQqnEZpP5jQ6a97IIOYCCbZPjoUQhEM3WSgNQcugaJ5oD7UWDc3iDTA+O3WEnsxc8/IN UEcudCjWnagQCf4BT8GGKYD5ppnGNwUTXv0HOHPl6LEgmKM/inZLt27wpSqhDXeZvZd4 2rU/03sH+pih/EswrPkr9z1ZAnWTXAgh8HmWSaHYZ8pXxwymxbAE35TaL628k4TFWPhY 0wxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677739775; 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=ZVLwX4/1xFXlWKrQ4yvKTTpd60WlUVF7Li1hvaAaZXc=; b=WnLxhVETpjCK2xs2zae10HNNlUZXguGZ08tXcu1G77FHML78xDEPuCLwvp0LFRxR6E bym0d0ujE+5JQjA7Oi6lE2tdydLLZuIi/l1V+IFUmfm+VOpMBN1NdQm2LK5KZ3/+VSBA 5yuIK9TDw9Y0d5y/vrvtvY5ZJCNVU8cjOZs2SHa+b1DYqPcJWfXi59zdjKihu1r+lvKh 5bDD8CxPCYCf8seoGlPORl1sD8jcA957IktlsnmRi2ZRJl8O7zBbXRYysWGg2i56rCfV SMZ1ZY6csg4A5QYN/KK/xsg04HAvbZrFAcXTm+uKIkQVLQKkKr7B6y7oEr73UFNqHP8o m/Jw== X-Gm-Message-State: AO0yUKXSk8mmBMj5B2fFPVHb4brYBMF5FMz+CVXtu/USXS2K8gETznWT WxtXivg8MRZ5o3h1a9Wtnd9tktQarww= X-Google-Smtp-Source: AK7set/4/uA2VLHJ1o1Lx0xNlATQjrAEVOfesspvVKPSVI/Cz9PyEWvJYH7yWrVAi+KJKSncKKKn1g== X-Received: by 2002:a17:902:dad1:b0:19d:461:9628 with SMTP id q17-20020a170902dad100b0019d04619628mr11063766plx.34.1677739775019; Wed, 01 Mar 2023 22:49:35 -0800 (PST) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id f4-20020a170902e98400b0019a8c9f7c4esm9518088plb.142.2023.03.01.22.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 22:49:34 -0800 (PST) From: Andy Tai Date: Wed, 1 Mar 2023 22:49:30 -0800 Message-Id: <20230302064930.7947-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::102a; envelope-from=lichengtai@gmail.com; helo=mail-pj1-x102a.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.25, 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: Expose 'allow-collisions' option of 'package' for 'upgrade' alias --- guix/scripts/upgrade.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: ef7df2ca7bb212455f1d6bbef5bbf7b1ac5a189d prerequisite-patch-id: 5c2c505e1fefe02b0b8fe068d673dcc8fcc8b246 prerequisite-patch-id: b3de9e1babefba1a1903b848f185b9f8bcb224f4 prerequisite-patch-id: d827e9c76e13bae69214ec1b674b0f6bfc4bfb34 diff --git a/guix/scripts/upgrade.scm b/guix/scripts/upgrade.scm index beb59cbe6f..423760a93b 100644 --- a/guix/scripts/upgrade.scm +++ b/guix/scripts/upgrade.scm @@ -36,6 +36,8 @@ (define (show-help) This is an alias for 'guix package -u'.\n")) (display (G_ " -p, --profile=PROFILE use PROFILE instead of the user's default profile")) + (display (G_ " + --allow-collisions do not treat collisions in the profile as an error")) (display (G_ " -v, --verbosity=LEVEL use the given verbosity LEVEL")) (display (G_ " @@ -65,7 +67,8 @@ (define %options ;; Preserve some of the 'guix package' options. (append (filter (lambda (option) (any (cut member <> (option-names option)) - '("profile" "dry-run" "verbosity" "do-not-upgrade"))) + '("profile" "dry-run" "verbosity" "do-not-upgrade" + "allow-collisions"))) %package-options) %transformation-options