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 CC7111382C5 for ; Fri, 29 May 2020 10:06:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C701FE08A4; 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 BCB0FE08A4 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=1590746778; h=Content-Transfer-Encoding: MIME-Version: Message-Id: Date: Subject: To: From: Sender; bh=VbtqjHhUGgX/BGxbADBSk6tPLPrijPanouJ+stBxpTU=; b=YNymq3H0YAEaLwcdlSwRz57wxgPPiTKHm3CFD8n3sZRysyCIdxChVnfxXe2YI4ga8STkAH+B G4eVCfCXoak8gDD2wOIS6FU3ffTk9pK+VBjTMYEx32amQtgMLWna5N/s8fTFUwppUqDQW8RH sGMnTg9/QPPE1bFNMm39jfej97Y= 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-n01.prod.us-east-1.postgun.com with SMTP id 5ed0de96c0031c71c217cb14 (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Fri, 29 May 2020 10:06:14 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 8B80E102CB1 for ; Fri, 29 May 2020 10:11:55 +0000 (UTC) From: Daniel Cordero 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 Message-Id: <20200529100551.916987-1-gentoo.catalyst@xxoo.ws> X-Mailer: git-send-email 2.26.2 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: b04637bd-6044-4214-9db1-f23269bb61ce X-Archives-Hash: e7bd9183a6aefe9d889969200d458038 From: Daniel Cordero 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