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 07BCB1382C5 for ; Fri, 29 May 2020 10:06:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15B5CE089F; Fri, 29 May 2020 10:06:18 +0000 (UTC) Received: from rs234.mailgun.us (rs234.mailgun.us [209.61.151.234]) (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 B7F56E089F for ; Fri, 29 May 2020 10:06:17 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=0xdc.io; q=dns/txt; s=smtp; t=1590746777; h=Content-Transfer-Encoding: MIME-Version: References: In-Reply-To: Message-Id: Date: Subject: To: From: Sender; bh=opUExTOC+csiDq1GfcI6JlrdpEdY5gL/ZU/gKGiWls4=; b=P9BDz27AyLTfEd5LugHwe79/fezLIU9MfsOLa5376p2F9H/GFz/TsXfScfo2yyBsuqds0OA/ Un5bzJPUUhg3NuDA3TbsTNZvQkL/COT+TL0AAJNcqTlEc6nA8IOVCBvpbhJkgRuQnKlmDIRC M+1h4B8VyhzvbXWcpwfyWYSCasA= X-Mailgun-Sending-Ip: 209.61.151.234 X-Mailgun-Sid: WyJiZmIxMyIsICJnZW50b28tY2F0YWx5c3RAbGlzdHMuZ2VudG9vLm9yZyIsICJmNjc0NGUiXQ== Received: from mail.0xdc.io (ip-54-37-0.eu [54.37.0.172]) by smtp-out-n02.prod.us-east-1.postgun.com with SMTP id 5ed0de9844a25e0052160214 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Fri, 29 May 2020 10:06:16 GMT Sender: gentoo.catalyst=xxoo.ws@0xdc.io Received: from dysnomia (4.3.b.2.7.6.d.4.8.7.8.e.1.d.4.3.0.a.4.7.9.0.c.0.0.b.8.0.1.0.0.2.ip6.arpa [IPv6:2001:8b0:c09:74a0:34d1:e878:4d67:2b34]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.0xdc.io (Postfix) with ESMTPSA id 6F4E4102CB1 for ; Fri, 29 May 2020 10:11:57 +0000 (UTC) From: Daniel Cordero To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 2/2] Add shdir to valid config values Date: Fri, 29 May 2020 10:05:52 +0000 Message-Id: <20200529100551.916987-2-gentoo.catalyst@xxoo.ws> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200529100551.916987-1-gentoo.catalyst@xxoo.ws> References: <20200529100551.916987-1-gentoo.catalyst@xxoo.ws> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 3141bb66-d87d-468a-bf78-9d501b438d91 X-Archives-Hash: a57993be8f65562a4dc0b811aedeb531 From: Daniel Cordero The catalyst.git script specified this configuration option, which would not pass validation because shdir was not in the list of valid_config_file_values. Add shdir to the list of allowed valid_config_file_values. Remove shdir from the catalyst.git script anyway, as it would match the default. Fixes: 8443f89f3c5df (catalyst: Verify config options against valid_config_file_values) NOTICE : Loading configuration file: /tmp/catalyst.conf.tyxsgh1l CRITICAL: Unknown option 'shdir' in config file /tmp/catalyst.conf.tyxsgh1l --- bin/catalyst.git | 1 - catalyst/defaults.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/catalyst.git b/bin/catalyst.git index 071bf58b..29b72c30 100755 --- a/bin/catalyst.git +++ b/bin/catalyst.git @@ -28,7 +28,6 @@ def main(argv): # Set up a config file with paths to the local tree. conf.write( ('sharedir="%(source_root)s"\n' - 'shdir="%(source_root)s/targets"\n' 'envscript="%(source_root)s/etc/catalystrc"\n' % {'source_root': source_root}).encode('utf8') ) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 14f671fe..b5026e95 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -18,6 +18,7 @@ valid_config_file_values = frozenset([ "repo_name", "repos", "sharedir", + "shdir", "storedir", "target_distdir", "target_pkgdir", -- 2.26.2