From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 865B71382C5 for ; Wed, 20 May 2020 03:42:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A2E2E08AD; Wed, 20 May 2020 03:42:41 +0000 (UTC) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E9DBE08AD for ; Wed, 20 May 2020 03:42:41 +0000 (UTC) Received: by mail-pf1-f196.google.com with SMTP id n18so923310pfa.2 for ; Tue, 19 May 2020 20:42:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rHAOxTURx7YdLD1yZ5hKZmvTdZNC5uIGMTXZCeP1Oyc=; b=pkjFl71WoHNo2Pl7pH45pT2YoAIjAUP4MIN4fgkD6sRqUQkx1kY1wOaQR8WWU2FdBZ mJaRCrGyT1q08XefSkVWpzfon3lRdgviHAifzkWuuu8HRX7eHs3w3rZB9Rh6gBrCDZ+S v8nVjiUZXtqQytflyfxauM62TdJH46oRDo+BI1YKvznx9kMitCM53hVIO6AYrUjUaLLI C/ZRSbUxIQmk1jw0JB/vyoVT3FMuswbcK/iTeQ48LXCJYemIZID0+34O/n4pOzDSjv0M rdN1pVREj4mrc4XaWnMYopgOWECLeNUqXnwGQ/SjjPmVqwU11xKHvFEk1INOyabWD4j7 iKRg== X-Gm-Message-State: AOAM532GKIMRNK+OE5uTQFUYwFYHShBRljOb8g/KZSD/8nPEflPNzu8m DtvMfJYeVhop6mVu/K6rJySpxrq/ X-Google-Smtp-Source: ABdhPJwvyKyD5HswZZe6x9N48BPb+MVlJkLT0wE2hNzotBmQOSFei7NgS/tdUHeS7SQEapYTSclNzA== X-Received: by 2002:a63:e44c:: with SMTP id i12mr2249591pgk.421.1589946160154; Tue, 19 May 2020 20:42:40 -0700 (PDT) Received: from localhost ([134.134.137.77]) by smtp.gmail.com with ESMTPSA id c63sm768649pfc.2.2020.05.19.20.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 20:42:39 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 03/21] catalyst: Drop --cli option Date: Tue, 19 May 2020 20:42:08 -0700 Message-Id: <20200520034226.2870937-3-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200520034226.2870937-1-mattst88@gentoo.org> References: <20200520034226.2870937-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: a9eb99d1-347e-45d5-b338-924bfa65a488 X-Archives-Hash: 326e9b29c882652dcf1a14e3e4a8afd1 This confusingly named option allowed you to specify and entire spec file on the command line. It seems that the addition of the --snapshot / -s option in commit ac746eff5363 (new -s option for creating snapshots) in 2004 removed all known uses, so let's remove it. Signed-off-by: Matt Turner --- catalyst/main.py | 5 +---- doc/catalyst.1.txt | 10 ---------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index 4ca1aa5b..bad712fa 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -202,9 +202,6 @@ def get_parser(): help='read specfile') group.add_argument('-s', '--snapshot', type=str, help='Make an ebuild repo snapshot') - group.add_argument('-C', '--cli', - default=[], nargs=argparse.REMAINDER, - help='catalyst commandline (MUST BE LAST OPTION)') return parser @@ -294,8 +291,8 @@ def _main(parser, opts): if not myconfigs: myconfigs = [DEFAULT_CONFIG_FILE] myspecfile = opts.file - mycmdline = opts.cli[:] + mycmdline = list() if opts.snapshot: mycmdline.append('target=snapshot') mycmdline.append('snapshot_treeish=' + opts.snapshot) diff --git a/doc/catalyst.1.txt b/doc/catalyst.1.txt index 46e21e63..90d5a24b 100644 --- a/doc/catalyst.1.txt +++ b/doc/catalyst.1.txt @@ -31,11 +31,6 @@ OPTIONS This option is to be used to clear any autoresume points that have been saved for this target. It is used in conjunction with *-f*, *-C*, or both. -*--cli*|*-C* 'KEY'='VALUE' ...:: -This option is to be used in place of a specfile. All options are passed -to *catalyst* on the commandline. Please note that this option must -be the last option passed to *catalyst* for everything to work correctly. - *--config*|*-c* 'FILE':: Tell *catalyst* to use a user-defined configuration file. A sample configuration file is installed at '/etc/catalyst/catalyst.conf'. @@ -75,11 +70,6 @@ Print the version information and exit EXAMPLES -------- -Using the commandline option (*-C*, *--cli*) to build a Portage snapshot: ---------------------------------------------------- -# catalyst -C target=snapshot version_stamp=my_date ---------------------------------------------------- - Using the specfile option (*-f*, *--file*) to build a stage target: --------------------------------------------------- # catalyst -f stage1-specfile.spec -- 2.26.2