commit: 5b3e7b3b13bad7bb602c7e01eb8403821a286d46 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Mon May 18 22:38:51 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Wed May 20 01:49:37 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5b3e7b3b
catalyst: Drop --cli option 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 <mattst88 <AT> gentoo.org> 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