From patchwork Wed Aug 19 21:38:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Maja_K=C4=85dzio=C5=82ka?= X-Patchwork-Id: 23690 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 3973427BBE5; Wed, 19 Aug 2020 22:39:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 5E46627BBE6 for ; Wed, 19 Aug 2020 22:39:08 +0100 (BST) Received: from localhost ([::1]:51778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8VnX-00035y-Tm for patchwork@mira.cbaines.net; Wed, 19 Aug 2020 17:39:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8VnS-00035o-HG for guix-patches@gnu.org; Wed, 19 Aug 2020 17:39:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57814) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8VnS-00017y-80 for guix-patches@gnu.org; Wed, 19 Aug 2020 17:39:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8VnS-0008BR-5d for guix-patches@gnu.org; Wed, 19 Aug 2020 17:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42938] [PATCH] guix upgrade: Allow using --do-not-upgrade. Resent-From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Aug 2020 21:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42938@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159787313931447 (code B ref -1); Wed, 19 Aug 2020 21:39:01 +0000 Received: (at submit) by debbugs.gnu.org; 19 Aug 2020 21:38:59 +0000 Received: from localhost ([127.0.0.1]:41127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8VnP-0008B8-J0 for submit@debbugs.gnu.org; Wed, 19 Aug 2020 17:38:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:59678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8VnN-0008B1-Nq for submit@debbugs.gnu.org; Wed, 19 Aug 2020 17:38:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8VnN-00035a-HH for guix-patches@gnu.org; Wed, 19 Aug 2020 17:38:57 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:46132) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8VnL-00016Y-DN for guix-patches@gnu.org; Wed, 19 Aug 2020 17:38:57 -0400 Received: (qmail 31862 invoked by uid 1009); 19 Aug 2020 23:38:45 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25904. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.013542 secs); 19 Aug 2020 21:38:45 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 19 Aug 2020 23:38:45 +0200 From: Jakub =?utf-8?b?S8SFZHppb8WCa2E=?= Date: Wed, 19 Aug 2020 23:38:38 +0200 Message-Id: <20200819213839.13612-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Received-SPF: none client-ip=37.59.186.212; envelope-from=kuba@kadziolka.net; helo=pat.zlotemysli.pl X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 17:38:45 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_NONE=0.001 autolearn=ham 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" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/upgrade.scm (%options): Add "do-not-upgrade" to list of options inherited from guix package. --- guix/scripts/upgrade.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/scripts/upgrade.scm b/guix/scripts/upgrade.scm index 7f14a2fdbe..d2784669be 100644 --- a/guix/scripts/upgrade.scm +++ b/guix/scripts/upgrade.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,7 +61,7 @@ This is an alias for 'guix package -u'.\n")) ;; Preserve some of the 'guix package' options. (append (filter (lambda (option) (any (cut member <> (option-names option)) - '("profile" "dry-run" "verbosity"))) + '("profile" "dry-run" "verbosity" "do-not-upgrade"))) %package-options) %transformation-options