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