| 1 |
commit: 3b721ac38a6d86c952e8d65e0bba942aa49a3628 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 18 22:41:54 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=3b721ac3 |
| 7 |
|
| 8 |
catalyst: Switch internal snapshot option parsing to SpecParser |
| 9 |
|
| 10 |
The --snapshot/-s option internally creates a .spec file but uses the |
| 11 |
ConfigParser (nominally used for parsing catalyst.conf) rather than |
| 12 |
SpecParser (used for parsing .spec files) and as a result has to use |
| 13 |
'=' rather than ':' as the key/value delimiter. |
| 14 |
|
| 15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 16 |
|
| 17 |
catalyst/main.py | 6 +++--- |
| 18 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 19 |
|
| 20 |
diff --git a/catalyst/main.py b/catalyst/main.py |
| 21 |
index b01d7a6a..be06ccd7 100644 |
| 22 |
--- a/catalyst/main.py |
| 23 |
+++ b/catalyst/main.py |
| 24 |
@@ -291,8 +291,8 @@ def _main(parser, opts): |
| 25 |
|
| 26 |
mycmdline = list() |
| 27 |
if opts.snapshot: |
| 28 |
- mycmdline.append('target=snapshot') |
| 29 |
- mycmdline.append('snapshot_treeish=' + opts.snapshot) |
| 30 |
+ mycmdline.append('target: snapshot') |
| 31 |
+ mycmdline.append('snapshot_treeish: ' + opts.snapshot) |
| 32 |
|
| 33 |
conf_values['DEBUG'] = opts.debug |
| 34 |
conf_values['VERBOSE'] = opts.debug or opts.verbose |
| 35 |
@@ -354,7 +354,7 @@ def _main(parser, opts): |
| 36 |
|
| 37 |
if mycmdline: |
| 38 |
try: |
| 39 |
- cmdline = catalyst.config.ConfigParser() |
| 40 |
+ cmdline = catalyst.config.SpecParser() |
| 41 |
cmdline.parse_lines(mycmdline) |
| 42 |
addlargs.update(cmdline.get_values()) |
| 43 |
except CatalystError: |
Archives