From e072dadbba8758c67bc83ee284af3453c734d7bd Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Fri, 3 Jan 2014 17:02:09 -0800 Subject: [PATCH] Creation of a new defaults.py catalyst/support.py: Move some defaults to a new defaults file. --- catalyst/defaults.py | 23 +++++++++++++++++++++++ catalyst/main.py | 5 ++--- catalyst/support.py | 35 +++-------------------------------- 3 files changed, 28 insertions(+), 35 deletions(-) create mode 100644 catalyst/defaults.py diff --git a/catalyst/defaults.py b/catalyst/defaults.py new file mode 100644 index 00000000..b1dbda48 --- /dev/null +++ b/catalyst/defaults.py @@ -0,0 +1,23 @@ + + +# these should never be touched +required_build_targets = ["generic_target", "generic_stage_target"] + +# new build types should be added here +valid_build_targets = ["stage1_target", "stage2_target", "stage3_target", + "stage4_target", "grp_target", "livecd_stage1_target", "livecd_stage2_target", + "embedded_target", "tinderbox_target", "snapshot_target", "netboot_target", + "netboot2_target" + ] + +required_config_file_values = ["storedir", "sharedir", "distdir", "portdir"] + +valid_config_file_values = required_config_file_values[:] +valid_config_file_values.extend(["PKGCACHE", "KERNCACHE", "CCACHE", "DISTCC", + "ICECREAM", "ENVSCRIPT", "AUTORESUME", "FETCH", "CLEAR_AUTORESUME", + "options", "DEBUG", "VERBOSE", "PURGE", "PURGEONLY", "SNAPCACHE", + "snapshot_cache", "hash_function", "digests", "contents", "SEEDCACHE" + ]) + +verbosity = 1 + diff --git a/catalyst/main.py b/catalyst/main.py index bba3cbab..e2ef9762 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -21,9 +21,8 @@ sys.path.append(__selfpath__ + "/modules") from . import __version__ import catalyst.config import catalyst.util -from catalyst.support import (required_build_targets, - valid_build_targets, CatalystError, find_binary, LockInUse) - +from catalyst.support import CatalystError, find_binary, LockInUse +from catalyst.defaults import required_build_targets, valid_build_targets from hash_utils import HashMap, HASH_DEFINITIONS from contents import ContentsMap, CONTENTS_DEFINITIONS diff --git a/catalyst/support.py b/catalyst/support.py index 5abf614f..4fe46034 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -1,6 +1,9 @@ import sys,string,os,types,re,signal,traceback,time #import md5,sha + +from catalyst.defaults import verbosity, valid_config_file_values + selinux_capable = False #userpriv_capable = (os.getuid() == 0) #fakeroot_capable = False @@ -80,38 +83,6 @@ def read_from_clst(file): return myline # read_from_clst -# these should never be touched -required_build_targets=["generic_target","generic_stage_target"] - -# new build types should be added here -valid_build_targets=["stage1_target","stage2_target","stage3_target","stage4_target","grp_target", - "livecd_stage1_target","livecd_stage2_target","embedded_target", - "tinderbox_target","snapshot_target","netboot_target","netboot2_target"] - -required_config_file_values=["storedir","sharedir","distdir","portdir"] -valid_config_file_values=required_config_file_values[:] -valid_config_file_values.append("PKGCACHE") -valid_config_file_values.append("KERNCACHE") -valid_config_file_values.append("CCACHE") -valid_config_file_values.append("DISTCC") -valid_config_file_values.append("ICECREAM") -valid_config_file_values.append("ENVSCRIPT") -valid_config_file_values.append("AUTORESUME") -valid_config_file_values.append("FETCH") -valid_config_file_values.append("CLEAR_AUTORESUME") -valid_config_file_values.append("options") -valid_config_file_values.append("DEBUG") -valid_config_file_values.append("VERBOSE") -valid_config_file_values.append("PURGE") -valid_config_file_values.append("PURGEONLY") -valid_config_file_values.append("SNAPCACHE") -valid_config_file_values.append("snapshot_cache") -valid_config_file_values.append("hash_function") -valid_config_file_values.append("digests") -valid_config_file_values.append("contents") -valid_config_file_values.append("SEEDCACHE") - -verbosity=1 def list_bashify(mylist): if type(mylist)==types.StringType: -- 2.26.2