From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 360E51383D3 for ; Tue, 1 Sep 2015 05:59:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B3A5142CF; Tue, 1 Sep 2015 05:59:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C9E8C142C4 for ; Tue, 1 Sep 2015 05:59:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1229E340885 for ; Tue, 1 Sep 2015 05:59:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECBE3188 for ; Tue, 1 Sep 2015 05:58:56 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1440990950.f499da75fe51ed8ae2830a20fef5a27bce633173.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/main.py X-VCS-Directories: catalyst/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f499da75fe51ed8ae2830a20fef5a27bce633173 X-VCS-Branch: pending Date: Tue, 1 Sep 2015 05:58:56 +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-Archives-Salt: 4c89d551-cd8e-4dbc-8b85-72004403171e X-Archives-Hash: 5aa65b05bcf1412c84c2f2a0c2e35621 commit: f499da75fe51ed8ae2830a20fef5a27bce633173 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Mon Aug 31 03:15:50 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Mon Aug 31 03:15:50 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f499da75 Revert "catalyst/main.py: Fix variables not being substituted with correct values" This reverts commit 4328dcd693ae02a77c519e5186e5430171c16ac5. Reverting due to : Envscript support enabled. Traceback (most recent call last): File "/usr/lib/python-exec/python2.7/catalyst", line 39, in main() File "/usr/lib64/python2.7/site-packages/catalyst/main.py", line 343, in main build_target(addlargs) File "/usr/lib64/python2.7/site-packages/catalyst/main.py", line 158, in build_target target = getattr(module, target)(conf_values, addlargs) File "/usr/lib64/python2.7/site-packages/catalyst/targets/stage1.py", line 21, in __init__ StageBase.__init__(self,spec,addlargs) File "/usr/lib64/python2.7/site-packages/catalyst/base/stagebase.py", line 72, in __init__ for x in [x[:-3] for x in os.listdir(arch_dir) if x.endswith(".py") and x != "__init__.py"]: OSError: [Errno 2] No such file or directory: './catalyst/arch/' catalyst/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalyst/main.py b/catalyst/main.py index 2335495..a222209 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -107,8 +107,8 @@ def parse_config(myconfig): else: conf_values[x]=myconf[x] else: - conf_values[x] = confdefaults[x] % confdefaults - print "Setting",x,"to default value \"" + conf_values[x] + "\"" + print "Setting",x,"to default value \""+confdefaults[x]+"\"" + conf_values[x]=confdefaults[x] # add our python base directory to use for loading target arch's conf_values["PythonDir"] = __selfpath__