Gentoo Archives: gentoo-catalyst

From: Daniel Cordero <gentoo.catalyst@××××.ws>
To: gentoo-catalyst@l.g.o
Subject: [gentoo-catalyst] [PATCH 1/2] catalyst.git: Quote toml paths in custom catalyst.conf
Date: Fri, 29 May 2020 10:06:19
Message-Id: 20200529100551.916987-1-gentoo.catalyst@xxoo.ws
1 From: Daniel Cordero <catalyst@××××.io>
2
3 With the change to catalyst.conf into TOML format, update the
4 catalyst.git script to quote paths. The / character is not allowed in
5 TOML values unless quoted.
6
7 fixes: 66e78a8d55d (catalyst: Convert catalyst.conf to TOML)
8
9 NOTICE : Loading configuration file: /tmp/catalyst.conf.3b5seckb
10 CRITICAL: Could not find parse configuration file: /tmp/catalyst.conf.3b5seckb: Invalid date or number (line 1 column 1 char 0)
11 ---
12 bin/catalyst.git | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/bin/catalyst.git b/bin/catalyst.git
16 index 9b3deaa1..071bf58b 100755
17 --- a/bin/catalyst.git
18 +++ b/bin/catalyst.git
19 @@ -27,9 +27,9 @@ def main(argv):
20 with tempfile.NamedTemporaryFile(prefix='catalyst.conf.') as conf:
21 # Set up a config file with paths to the local tree.
22 conf.write(
23 - ('sharedir=%(source_root)s\n'
24 - 'shdir=%(source_root)s/targets\n'
25 - 'envscript=%(source_root)s/etc/catalystrc\n'
26 + ('sharedir="%(source_root)s"\n'
27 + 'shdir="%(source_root)s/targets"\n'
28 + 'envscript="%(source_root)s/etc/catalystrc"\n'
29 % {'source_root': source_root}).encode('utf8')
30 )
31 conf.flush()
32 --
33 2.26.2

Replies

Subject Author
[gentoo-catalyst] [PATCH 2/2] Add shdir to valid config values Daniel Cordero <gentoo.catalyst@××××.ws>