| 1 |
commit: 5b3e7b3b13bad7bb602c7e01eb8403821a286d46 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 18 22:38:51 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 20 01:49:37 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5b3e7b3b |
| 7 |
|
| 8 |
catalyst: Drop --cli option |
| 9 |
|
| 10 |
This confusingly named option allowed you to specify and entire spec |
| 11 |
file on the command line. It seems that the addition of the --snapshot / |
| 12 |
-s option in commit ac746eff5363 (new -s option for creating snapshots) |
| 13 |
in 2004 removed all known uses, so let's remove it. |
| 14 |
|
| 15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 16 |
|
| 17 |
catalyst/main.py | 5 +---- |
| 18 |
doc/catalyst.1.txt | 10 ---------- |
| 19 |
2 files changed, 1 insertion(+), 14 deletions(-) |
| 20 |
|
| 21 |
diff --git a/catalyst/main.py b/catalyst/main.py |
| 22 |
index 4ca1aa5b..bad712fa 100644 |
| 23 |
--- a/catalyst/main.py |
| 24 |
+++ b/catalyst/main.py |
| 25 |
@@ -202,9 +202,6 @@ def get_parser(): |
| 26 |
help='read specfile') |
| 27 |
group.add_argument('-s', '--snapshot', type=str, |
| 28 |
help='Make an ebuild repo snapshot') |
| 29 |
- group.add_argument('-C', '--cli', |
| 30 |
- default=[], nargs=argparse.REMAINDER, |
| 31 |
- help='catalyst commandline (MUST BE LAST OPTION)') |
| 32 |
|
| 33 |
return parser |
| 34 |
|
| 35 |
@@ -294,8 +291,8 @@ def _main(parser, opts): |
| 36 |
if not myconfigs: |
| 37 |
myconfigs = [DEFAULT_CONFIG_FILE] |
| 38 |
myspecfile = opts.file |
| 39 |
- mycmdline = opts.cli[:] |
| 40 |
|
| 41 |
+ mycmdline = list() |
| 42 |
if opts.snapshot: |
| 43 |
mycmdline.append('target=snapshot') |
| 44 |
mycmdline.append('snapshot_treeish=' + opts.snapshot) |
| 45 |
|
| 46 |
diff --git a/doc/catalyst.1.txt b/doc/catalyst.1.txt |
| 47 |
index 46e21e63..90d5a24b 100644 |
| 48 |
--- a/doc/catalyst.1.txt |
| 49 |
+++ b/doc/catalyst.1.txt |
| 50 |
@@ -31,11 +31,6 @@ OPTIONS |
| 51 |
This option is to be used to clear any autoresume points that have been saved |
| 52 |
for this target. It is used in conjunction with *-f*, *-C*, or both. |
| 53 |
|
| 54 |
-*--cli*|*-C* 'KEY'='VALUE' ...:: |
| 55 |
-This option is to be used in place of a specfile. All options are passed |
| 56 |
-to *catalyst* on the commandline. Please note that this option must |
| 57 |
-be the last option passed to *catalyst* for everything to work correctly. |
| 58 |
- |
| 59 |
*--config*|*-c* 'FILE':: |
| 60 |
Tell *catalyst* to use a user-defined configuration file. A sample |
| 61 |
configuration file is installed at '/etc/catalyst/catalyst.conf'. |
| 62 |
@@ -75,11 +70,6 @@ Print the version information and exit |
| 63 |
|
| 64 |
EXAMPLES |
| 65 |
-------- |
| 66 |
-Using the commandline option (*-C*, *--cli*) to build a Portage snapshot: |
| 67 |
---------------------------------------------------- |
| 68 |
-# catalyst -C target=snapshot version_stamp=my_date |
| 69 |
---------------------------------------------------- |
| 70 |
- |
| 71 |
Using the specfile option (*-f*, *--file*) to build a stage target: |
| 72 |
--------------------------------------------------- |
| 73 |
# catalyst -f stage1-specfile.spec |
Archives