commit: f186361602b69e1c80bea5b43098d7cde7bddc15
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 04:13:13 2013 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan 1 05:58:06 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f1863616
Add archdir to settings
---
catalyst/base/stagebase.py | 8 +++-----
catalyst/defaults.py | 2 ++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 96b1c19..daf8e54 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -66,17 +66,15 @@ class StageBase(TargetBase, ClearBase, GenBase):
self.archmap = {}
self.subarchmap = {}
machinemap = {}
- arch_dir = self.settings["PythonDir"] + "/arch/"
- for x in [x[:-3] for x in os.listdir(arch_dir) if
x.endswith(".py")]:
- if x == "__init__":
- continue
+ arch_dir = self.settings["archdir"] + "/"
+ for x in [x[:-3] for x in os.listdir(arch_dir) if
x.endswith(".py") and x != "__init__.py"]:
try:
fh=open(arch_dir + x + ".py")
"""
This next line loads the plugin as a module and
assigns it to
archmap[x]
"""
- self.archmap[x]=imp.load_module(x,fh,"../arch/"
+ x + ".py",
+ self.archmap[x]=imp.load_module(x,fh, arch_dir
+ x + ".py",
(".py", "r", imp.PY_SOURCE))
"""
This next line registers all the subarches
supported in the
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 2839a3d..2f4f429 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -21,6 +21,7 @@ valid_config_file_values.extend([ "distcc", "envscript",
verbosity = 1
confdefaults={
+ "archdir": "%(PythonDir)s/arch",
"distdir": "/usr/portage/distfiles",
"hash_function": "crc32",
"icecream": "/var/cache/icecream",
@@ -30,6 +31,7 @@ confdefaults={
"packagedir": "/usr/portage/packages",
"portdir": "/usr/portage",
"port_tmpdir": "/var/tmp/portage",
+ "PythonDir": "./catalyst",
"repo_name": "portage",
"sharedir": "/usr/lib/catalyst",
"shdir": "/usr/lib/catalyst/targets/",
