1 |
commit: f499da75fe51ed8ae2830a20fef5a27bce633173 |
2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 31 03:15:50 2015 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 31 03:15:50 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f499da75 |
7 |
|
8 |
Revert "catalyst/main.py: Fix variables not being substituted with correct values" |
9 |
|
10 |
This reverts commit 4328dcd693ae02a77c519e5186e5430171c16ac5. |
11 |
|
12 |
Reverting due to : |
13 |
|
14 |
Envscript support enabled. |
15 |
Traceback (most recent call last): |
16 |
File "/usr/lib/python-exec/python2.7/catalyst", line 39, in <module> |
17 |
main() |
18 |
File "/usr/lib64/python2.7/site-packages/catalyst/main.py", line 343, in main |
19 |
build_target(addlargs) |
20 |
File "/usr/lib64/python2.7/site-packages/catalyst/main.py", line 158, in build_target |
21 |
target = getattr(module, target)(conf_values, addlargs) |
22 |
File "/usr/lib64/python2.7/site-packages/catalyst/targets/stage1.py", line 21, in __init__ |
23 |
StageBase.__init__(self,spec,addlargs) |
24 |
File "/usr/lib64/python2.7/site-packages/catalyst/base/stagebase.py", line 72, in __init__ |
25 |
for x in [x[:-3] for x in os.listdir(arch_dir) if x.endswith(".py") and x != "__init__.py"]: |
26 |
OSError: [Errno 2] No such file or directory: './catalyst/arch/' |
27 |
|
28 |
catalyst/main.py | 4 ++-- |
29 |
1 file changed, 2 insertions(+), 2 deletions(-) |
30 |
|
31 |
diff --git a/catalyst/main.py b/catalyst/main.py |
32 |
index 2335495..a222209 100644 |
33 |
--- a/catalyst/main.py |
34 |
+++ b/catalyst/main.py |
35 |
@@ -107,8 +107,8 @@ def parse_config(myconfig): |
36 |
else: |
37 |
conf_values[x]=myconf[x] |
38 |
else: |
39 |
- conf_values[x] = confdefaults[x] % confdefaults |
40 |
- print "Setting",x,"to default value \"" + conf_values[x] + "\"" |
41 |
+ print "Setting",x,"to default value \""+confdefaults[x]+"\"" |
42 |
+ conf_values[x]=confdefaults[x] |
43 |
|
44 |
# add our python base directory to use for loading target arch's |
45 |
conf_values["PythonDir"] = __selfpath__ |