commit: f499da75fe51ed8ae2830a20fef5a27bce633173
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 03:15:50 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> 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 <module>
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__
