1 |
catalyst/support.py: Move some defaults to a new defaults file. |
2 |
--- |
3 |
catalyst/defaults.py | 23 +++++++++++++++++++++++ |
4 |
catalyst/main.py | 5 ++--- |
5 |
catalyst/support.py | 35 +++-------------------------------- |
6 |
3 files changed, 28 insertions(+), 35 deletions(-) |
7 |
create mode 100644 catalyst/defaults.py |
8 |
|
9 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
10 |
new file mode 100644 |
11 |
index 0000000..b1dbda4 |
12 |
--- /dev/null |
13 |
+++ b/catalyst/defaults.py |
14 |
@@ -0,0 +1,23 @@ |
15 |
+ |
16 |
+ |
17 |
+# these should never be touched |
18 |
+required_build_targets = ["generic_target", "generic_stage_target"] |
19 |
+ |
20 |
+# new build types should be added here |
21 |
+valid_build_targets = ["stage1_target", "stage2_target", "stage3_target", |
22 |
+ "stage4_target", "grp_target", "livecd_stage1_target", "livecd_stage2_target", |
23 |
+ "embedded_target", "tinderbox_target", "snapshot_target", "netboot_target", |
24 |
+ "netboot2_target" |
25 |
+ ] |
26 |
+ |
27 |
+required_config_file_values = ["storedir", "sharedir", "distdir", "portdir"] |
28 |
+ |
29 |
+valid_config_file_values = required_config_file_values[:] |
30 |
+valid_config_file_values.extend(["PKGCACHE", "KERNCACHE", "CCACHE", "DISTCC", |
31 |
+ "ICECREAM", "ENVSCRIPT", "AUTORESUME", "FETCH", "CLEAR_AUTORESUME", |
32 |
+ "options", "DEBUG", "VERBOSE", "PURGE", "PURGEONLY", "SNAPCACHE", |
33 |
+ "snapshot_cache", "hash_function", "digests", "contents", "SEEDCACHE" |
34 |
+ ]) |
35 |
+ |
36 |
+verbosity = 1 |
37 |
+ |
38 |
diff --git a/catalyst/main.py b/catalyst/main.py |
39 |
index bba3cba..e2ef976 100644 |
40 |
--- a/catalyst/main.py |
41 |
+++ b/catalyst/main.py |
42 |
@@ -21,9 +21,8 @@ sys.path.append(__selfpath__ + "/modules") |
43 |
from . import __version__ |
44 |
import catalyst.config |
45 |
import catalyst.util |
46 |
-from catalyst.support import (required_build_targets, |
47 |
- valid_build_targets, CatalystError, find_binary, LockInUse) |
48 |
- |
49 |
+from catalyst.support import CatalystError, find_binary, LockInUse |
50 |
+from catalyst.defaults import required_build_targets, valid_build_targets |
51 |
from hash_utils import HashMap, HASH_DEFINITIONS |
52 |
from contents import ContentsMap, CONTENTS_DEFINITIONS |
53 |
|
54 |
diff --git a/catalyst/support.py b/catalyst/support.py |
55 |
index 5abf614..4fe4603 100644 |
56 |
--- a/catalyst/support.py |
57 |
+++ b/catalyst/support.py |
58 |
@@ -1,6 +1,9 @@ |
59 |
|
60 |
import sys,string,os,types,re,signal,traceback,time |
61 |
#import md5,sha |
62 |
+ |
63 |
+from catalyst.defaults import verbosity, valid_config_file_values |
64 |
+ |
65 |
selinux_capable = False |
66 |
#userpriv_capable = (os.getuid() == 0) |
67 |
#fakeroot_capable = False |
68 |
@@ -80,38 +83,6 @@ def read_from_clst(file): |
69 |
return myline |
70 |
# read_from_clst |
71 |
|
72 |
-# these should never be touched |
73 |
-required_build_targets=["generic_target","generic_stage_target"] |
74 |
- |
75 |
-# new build types should be added here |
76 |
-valid_build_targets=["stage1_target","stage2_target","stage3_target","stage4_target","grp_target", |
77 |
- "livecd_stage1_target","livecd_stage2_target","embedded_target", |
78 |
- "tinderbox_target","snapshot_target","netboot_target","netboot2_target"] |
79 |
- |
80 |
-required_config_file_values=["storedir","sharedir","distdir","portdir"] |
81 |
-valid_config_file_values=required_config_file_values[:] |
82 |
-valid_config_file_values.append("PKGCACHE") |
83 |
-valid_config_file_values.append("KERNCACHE") |
84 |
-valid_config_file_values.append("CCACHE") |
85 |
-valid_config_file_values.append("DISTCC") |
86 |
-valid_config_file_values.append("ICECREAM") |
87 |
-valid_config_file_values.append("ENVSCRIPT") |
88 |
-valid_config_file_values.append("AUTORESUME") |
89 |
-valid_config_file_values.append("FETCH") |
90 |
-valid_config_file_values.append("CLEAR_AUTORESUME") |
91 |
-valid_config_file_values.append("options") |
92 |
-valid_config_file_values.append("DEBUG") |
93 |
-valid_config_file_values.append("VERBOSE") |
94 |
-valid_config_file_values.append("PURGE") |
95 |
-valid_config_file_values.append("PURGEONLY") |
96 |
-valid_config_file_values.append("SNAPCACHE") |
97 |
-valid_config_file_values.append("snapshot_cache") |
98 |
-valid_config_file_values.append("hash_function") |
99 |
-valid_config_file_values.append("digests") |
100 |
-valid_config_file_values.append("contents") |
101 |
-valid_config_file_values.append("SEEDCACHE") |
102 |
- |
103 |
-verbosity=1 |
104 |
|
105 |
def list_bashify(mylist): |
106 |
if type(mylist)==types.StringType: |
107 |
-- |
108 |
1.8.5.3 |