1 |
Rather than appending a directory to the system path, this patch adds a |
2 |
__init__.py file to modules, which allows python to search it, and it's |
3 |
children for python modules. This also requires changes to a few of the |
4 |
module files to make them happy. |
5 |
--- |
6 |
catalyst | 16 ++++++---------- |
7 |
modules/__init__.py | 0 |
8 |
modules/catalyst/config.py | 2 +- |
9 |
3 files changed, 7 insertions(+), 11 deletions(-) |
10 |
create mode 100644 modules/__init__.py |
11 |
|
12 |
diff --git a/catalyst b/catalyst |
13 |
index 11560fb..2378a87 100755 |
14 |
--- a/catalyst |
15 |
+++ b/catalyst |
16 |
@@ -11,12 +11,8 @@ import os, sys, imp, string, getopt |
17 |
import pdb |
18 |
import os.path |
19 |
|
20 |
-__selfpath__ = os.path.abspath(os.path.dirname(__file__)) |
21 |
- |
22 |
-sys.path.append(__selfpath__ + "/modules") |
23 |
- |
24 |
-import catalyst.config |
25 |
-import catalyst.util |
26 |
+import modules.catalyst.config |
27 |
+import modules.catalyst.util |
28 |
|
29 |
__maintainer__="Catalyst <catalyst@g.o>" |
30 |
__version__="2.0.14" |
31 |
@@ -91,7 +87,7 @@ def parse_config(myconfig): |
32 |
# now, try and parse the config file "config_file" |
33 |
try: |
34 |
# execfile(config_file, myconf, myconf) |
35 |
- myconfig = catalyst.config.ConfigParser(config_file) |
36 |
+ myconfig = modules.catalyst.config.ConfigParser(config_file) |
37 |
myconf.update(myconfig.get_values()) |
38 |
|
39 |
except: |
40 |
@@ -226,7 +222,7 @@ def build_target(addlargs, targetmap): |
41 |
mytarget.run() |
42 |
|
43 |
except: |
44 |
- catalyst.util.print_traceback() |
45 |
+ modules.catalyst.util.print_traceback() |
46 |
print "!!! catalyst: Error encountered during run of target " + addlargs["target"] |
47 |
sys.exit(1) |
48 |
|
49 |
@@ -379,12 +375,12 @@ if __name__ == "__main__": |
50 |
addlargs={} |
51 |
|
52 |
if myspecfile: |
53 |
- spec = catalyst.config.SpecParser(myspecfile) |
54 |
+ spec = modules.catalyst.config.SpecParser(myspecfile) |
55 |
addlargs.update(spec.get_values()) |
56 |
|
57 |
if mycmdline: |
58 |
try: |
59 |
- cmdline = catalyst.config.ConfigParser() |
60 |
+ cmdline = modules.catalyst.config.ConfigParser() |
61 |
cmdline.parse_lines(mycmdline) |
62 |
addlargs.update(cmdline.get_values()) |
63 |
except CatalystError: |
64 |
diff --git a/modules/__init__.py b/modules/__init__.py |
65 |
new file mode 100644 |
66 |
index 0000000..e69de29 |
67 |
diff --git a/modules/catalyst/config.py b/modules/catalyst/config.py |
68 |
index 00da343..726bf74 100644 |
69 |
--- a/modules/catalyst/config.py |
70 |
+++ b/modules/catalyst/config.py |
71 |
@@ -1,5 +1,5 @@ |
72 |
import re |
73 |
-from catalyst_support import * |
74 |
+from modules.catalyst_support import * |
75 |
|
76 |
class ParserBase: |
77 |
|
78 |
-- |
79 |
1.8.1.5 |