From: Daniel Cordero <gentoo.catalyst@xxoo.ws>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 1/2] catalyst.git: Quote toml paths in custom catalyst.conf
Date: Fri, 29 May 2020 10:05:51 +0000 [thread overview]
Message-ID: <20200529100551.916987-1-gentoo.catalyst@xxoo.ws> (raw)
From: Daniel Cordero <catalyst@0xdc.io>
With the change to catalyst.conf into TOML format, update the
catalyst.git script to quote paths. The / character is not allowed in
TOML values unless quoted.
fixes: 66e78a8d55d (catalyst: Convert catalyst.conf to TOML)
NOTICE : Loading configuration file: /tmp/catalyst.conf.3b5seckb
CRITICAL: Could not find parse configuration file: /tmp/catalyst.conf.3b5seckb: Invalid date or number (line 1 column 1 char 0)
---
bin/catalyst.git | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/catalyst.git b/bin/catalyst.git
index 9b3deaa1..071bf58b 100755
--- a/bin/catalyst.git
+++ b/bin/catalyst.git
@@ -27,9 +27,9 @@ def main(argv):
with tempfile.NamedTemporaryFile(prefix='catalyst.conf.') as conf:
# 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'
+ ('sharedir="%(source_root)s"\n'
+ 'shdir="%(source_root)s/targets"\n'
+ 'envscript="%(source_root)s/etc/catalystrc"\n'
% {'source_root': source_root}).encode('utf8')
)
conf.flush()
--
2.26.2
next reply other threads:[~2020-05-29 10:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 10:05 Daniel Cordero [this message]
2020-05-29 10:05 ` [gentoo-catalyst] [PATCH 2/2] Add shdir to valid config values Daniel Cordero
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200529100551.916987-1-gentoo.catalyst@xxoo.ws \
--to=gentoo.catalyst@xxoo.ws \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox