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 A7E141382C5 for ; Thu, 21 May 2020 20:25:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 377CFE0968; Thu, 21 May 2020 20:25:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 23DC4E0968 for ; Thu, 21 May 2020 20:25:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2FBD534F2AE for ; Thu, 21 May 2020 20:25:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5709258 for ; Thu, 21 May 2020 20:25:33 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1589939377.3b721ac38a6d86c952e8d65e0bba942aa49a3628.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/main.py X-VCS-Directories: catalyst/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 3b721ac38a6d86c952e8d65e0bba942aa49a3628 X-VCS-Branch: master Date: Thu, 21 May 2020 20:25:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ef810c14-4a2b-4b24-9c69-0fdbedbea6cb X-Archives-Hash: 8ea5907f689e4c535188d1978c6a69e7 Message-ID: <20200521202533.Wkkta6tARBJkzJ1hKckHicSeGLdEPXA2Z2xoZt-uEdc@z> commit: 3b721ac38a6d86c952e8d65e0bba942aa49a3628 Author: Matt Turner gentoo org> AuthorDate: Mon May 18 22:41:54 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed May 20 01:49:37 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3b721ac3 catalyst: Switch internal snapshot option parsing to SpecParser The --snapshot/-s option internally creates a .spec file but uses the ConfigParser (nominally used for parsing catalyst.conf) rather than SpecParser (used for parsing .spec files) and as a result has to use '=' rather than ':' as the key/value delimiter. Signed-off-by: Matt Turner gentoo.org> catalyst/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index b01d7a6a..be06ccd7 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -291,8 +291,8 @@ def _main(parser, opts): mycmdline = list() if opts.snapshot: - mycmdline.append('target=snapshot') - mycmdline.append('snapshot_treeish=' + opts.snapshot) + mycmdline.append('target: snapshot') + mycmdline.append('snapshot_treeish: ' + opts.snapshot) conf_values['DEBUG'] = opts.debug conf_values['VERBOSE'] = opts.debug or opts.verbose @@ -354,7 +354,7 @@ def _main(parser, opts): if mycmdline: try: - cmdline = catalyst.config.ConfigParser() + cmdline = catalyst.config.SpecParser() cmdline.parse_lines(mycmdline) addlargs.update(cmdline.get_values()) except CatalystError: