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