From 9196a11748a80e7228ae09db612504ee8f50f7d9 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Sat, 19 Jan 2013 17:28:51 -0800 Subject: [PATCH] Some options cleanup, unifying their use, reducing redundancy. --- catalyst/defaults.py | 24 ++++- catalyst/main.py | 94 ++++------------- catalyst/targets/generic_stage_target.py | 127 +++++++++++------------ catalyst/targets/grp_target.py | 2 +- catalyst/targets/livecd_stage1_target.py | 2 +- catalyst/targets/livecd_stage2_target.py | 8 +- catalyst/targets/netboot2_target.py | 10 +- catalyst/targets/snapshot_target.py | 4 +- catalyst/targets/stage2_target.py | 2 +- catalyst/targets/stage4_target.py | 4 +- 10 files changed, 121 insertions(+), 156 deletions(-) diff --git a/catalyst/defaults.py b/catalyst/defaults.py index 6eff39ed..f87bc8bb 100644 --- a/catalyst/defaults.py +++ b/catalyst/defaults.py @@ -13,10 +13,9 @@ valid_build_targets = ["stage1_target", "stage2_target", "stage3_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" +valid_config_file_values.extend([ "distcc", "envscript", + "options", "DEBUG", "VERBOSE", + "snapshot_cache", "hash_function", "digests", "contents" ]) verbosity = 1 @@ -76,9 +75,24 @@ confdefaults={ "portdir": "/usr/portage", "packagedir": "/usr/portage/packages", "port_tmpdir": "/var/tmp/portage", - "options": "", + "options": set(), "snapshot_name": "portage-", "snapshot_cache": "/var/tmp/catalyst/snapshot_cache", "hash_function": "crc32", } +# legend: key: message +option_messages = { + "autoresume": "Autoresuming support enabled.", + "ccache": "Compiler cache support enabled.", + "clear-autoresume": "Cleaning autoresume flags support enabled.", + #"compress": "Compression enabled.", + "distcc": "Distcc support enabled.", + "icecream": "Icecream compiler cluster support enabled.", + "kerncache": "Kernel cache support enabled.", + "pkgcache": "Package cache support enabled.", + "purge": "Purge support enabled.", + "seedcache": "Seed cache support enabled.", + "snapcache": "Snapshot cache support enabled.", + #"tarball": "Tarball creation enabled.", + } diff --git a/catalyst/main.py b/catalyst/main.py index d5f68cc2..27ee7393 100644 --- a/catalyst/main.py +++ b/catalyst/main.py @@ -19,7 +19,7 @@ import catalyst.config import catalyst.util from catalyst.support import CatalystError, find_binary, LockInUse from catalyst.defaults import (required_build_targets, valid_build_targets, - hash_definitions, confdefaults + hash_definitions, confdefaults, option_messages ) from hash_utils import HashMap @@ -109,7 +109,10 @@ def parse_config(myconfig): for x in list(confdefaults): if x in myconf: print "Setting",x,"to config file value \""+myconf[x]+"\"" - conf_values[x]=myconf[x] + if x == 'options': + conf_values[x] = set(myconf[x].split()) + else: + conf_values[x]=myconf[x] else: print "Setting",x,"to default value \""+confdefaults[x]+"\"" conf_values[x]=confdefaults[x] @@ -117,78 +120,23 @@ def parse_config(myconfig): # add our python base directory to use for loading target arch's conf_values["PythonDir"] = __selfpath__ - # parse out the rest of the options from the config file - if "autoresume" in string.split(conf_values["options"]): - print "Autoresuming support enabled." - conf_values["AUTORESUME"]="1" - - if "bindist" in string.split(conf_values["options"]): - print "Binary redistribution enabled" - conf_values["BINDIST"]="1" - else: - print "Bindist is not enabled in catalyst.conf" - print "Binary redistribution of generated stages/isos may be prohibited by law." - print "Please see the use description for bindist on any package you are including." - - if "ccache" in string.split(conf_values["options"]): - print "Compiler cache support enabled." - conf_values["CCACHE"]="1" - - if "clear-autoresume" in string.split(conf_values["options"]): - print "Cleaning autoresume flags support enabled." - conf_values["CLEAR_AUTORESUME"]="1" - -# if "compress" in string.split(conf_values["options"]): -# print "Compression enabled." -# conf_values["COMPRESS"]="1" - - if "distcc" in string.split(conf_values["options"]): - print "Distcc support enabled." - conf_values["DISTCC"]="1" - - if "icecream" in string.split(conf_values["options"]): - print "Icecream compiler cluster support enabled." - conf_values["ICECREAM"]="1" - if "kerncache" in string.split(conf_values["options"]): - print "Kernel cache support enabled." - conf_values["KERNCACHE"]="1" + # print out any options messages + for opt in conf_values['options']: + if opt in option_messages: + print option_messages[opt] - if "pkgcache" in string.split(conf_values["options"]): - print "Package cache support enabled." - conf_values["PKGCACHE"]="1" + for key in ["digests", "envscript", "var_tmpfs_portage", "port_logdir"]: + if key in myconf: + conf_values[key] = myconf[key] - if "purge" in string.split(conf_values["options"]): - print "Purge support enabled." - conf_values["PURGE"]="1" - - if "seedcache" in string.split(conf_values["options"]): - print "Seed cache support enabled." - conf_values["SEEDCACHE"]="1" - - if "snapcache" in string.split(conf_values["options"]): - print "Snapshot cache support enabled." - conf_values["SNAPCACHE"]="1" - -# if "tarball" in string.split(conf_values["options"]): -# print "Tarball creation enabled." -# conf_values["TARBALL"]="1" - - if "digests" in myconf: - conf_values["digests"]=myconf["digests"] if "contents" in myconf: # replace '-' with '_' (for compatibility with existing configs) conf_values["contents"] = myconf["contents"].replace("-", '_') if "envscript" in myconf: print "Envscript support enabled." - conf_values["ENVSCRIPT"]=myconf["envscript"] - if "var_tmpfs_portage" in myconf: - conf_values["var_tmpfs_portage"]=myconf["var_tmpfs_portage"]; - - if "port_logdir" in myconf: - conf_values["port_logdir"]=myconf["port_logdir"]; def import_modules(): # import catalyst's own modules @@ -285,6 +233,10 @@ def main(): usage() sys.exit(2) + # initialize it if it's not already + if 'options' not in conf_values: + conf_values['options'] = set() + run = False for o, a in opts: if o in ("-h", "--help"): @@ -296,8 +248,8 @@ def main(): sys.exit(1) if o in ("-d", "--debug"): - conf_values["DEBUG"]="1" - conf_values["VERBOSE"]="1" + conf_values["DEBUG"] = True + conf_values["VERBOSE"] = True if o in ("-c", "--config"): myconfig=a @@ -314,7 +266,7 @@ def main(): myspecfile=a if o in ("-F", "--fetchonly"): - conf_values["FETCH"]="1" + conf_values['options'].add("fetch") if o in ("-v", "--verbose"): conf_values["VERBOSE"]="1" @@ -330,16 +282,16 @@ def main(): mycmdline.append("version_stamp="+a) if o in ("-p", "--purge"): - conf_values["PURGE"] = "1" + conf_values['options'].add("purge") if o in ("-P", "--purgeonly"): - conf_values["PURGEONLY"] = "1" + conf_values['options'].add("purgeonly") if o in ("-T", "--purgetmponly"): - conf_values["PURGETMPONLY"] = "1" + conf_values['options'].add("purgetmponly") if o in ("-a", "--clear-autoresume"): - conf_values["CLEAR_AUTORESUME"] = "1" + conf_values['options'].add("clear-autoresume") if not run: print "!!! catalyst: please specify one of either -f or -C\n" diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py index 6b6e801a..078e6b50 100644 --- a/catalyst/targets/generic_stage_target.py +++ b/catalyst/targets/generic_stage_target.py @@ -173,11 +173,11 @@ class generic_stage_target(generic_target): file_locate(self.settings,["portage_confdir"],expand=0) """ Setup our mount points """ - if "SNAPCACHE" in self.settings: - self.mounts=["/proc","/dev","/usr/portage","/usr/portage/distfiles","/var/tmp/portage"] - self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\ - "/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\ - "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"} + if "snapcache" in self.settings["options"]: + self.mounts=["proc", "dev", 'portdir', 'distdir', 'port_tmpdir'] + self.mountmap={"proc":"proc", "dev":"/dev", "pts":"/dev/pts", + "portdir":self.settings["snapshot_cache_path"]+"/" + self.settings["repo_name"], + "distdir":self.settings["distdir"],"port_tmpdir":"tmpfs"} else: self.mounts=["proc","dev", "distdir", "port_tmpdir"] self.mountmap={"proc":"/proc", "dev":"/dev", "pts":"/dev/pts", @@ -191,21 +191,21 @@ class generic_stage_target(generic_target): Configure any user specified options (either in catalyst.conf or on the command line). """ - if "PKGCACHE" in self.settings: + if "pkgcache" in self.settings["options"]: self.set_pkgcache_path() print "Location of the package cache is "+\ self.settings["pkgcache_path"] self.mounts.append("packagedir") self.mountmap["packagedir"] = self.settings["pkgcache_path"] - if "KERNCACHE" in self.settings: + if "kerncache" in self.settings["options"]: self.set_kerncache_path() print "Location of the kerncache is "+\ self.settings["kerncache_path"] self.mounts.append("kerncache") self.mountmap["kerncache"]=self.settings["kerncache_path"] - if "CCACHE" in self.settings: + if "ccache" in self.settings["options"]: if "CCACHE_DIR" in os.environ: ccdir=os.environ["CCACHE_DIR"] del os.environ["CCACHE_DIR"] @@ -220,9 +220,9 @@ class generic_stage_target(generic_target): """ for the chroot: """ self.env["CCACHE_DIR"]="/var/tmp/ccache" - if "ICECREAM" in self.settings: - self.mounts.append("/var/cache/icecream") - self.mountmap["/var/cache/icecream"]="/var/cache/icecream" + if "icecream" in self.settings["options"]: + self.mounts.append("icecream") + self.mountmap["icecream"]="/var/cache/icecream" self.env["PATH"]="/usr/lib/icecc/bin:"+self.env["PATH"] if "port_logdir" in self.settings: @@ -295,7 +295,7 @@ class generic_stage_target(generic_target): def set_target_path(self): self.settings["target_path"]=normpath(self.settings["storedir"]+\ "/builds/"+self.settings["target_subpath"]+".tar.bz2") - if "AUTORESUME" in self.settings\ + if "autoresume" in self.settings["options"]\ and os.path.exists(self.settings["autoresume_path"]+\ "setup_target_path"): print \ @@ -373,7 +373,7 @@ class generic_stage_target(generic_target): del self.settings[self.settings["spec_prefix"]+"/fsops"] def set_source_path(self): - if "SEEDCACHE" in self.settings\ + if "seedcache" in self.settings["options"]\ and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+\ self.settings["source_subpath"]+"/")): self.settings["source_path"]=normpath(self.settings["storedir"]+\ @@ -427,7 +427,7 @@ class generic_stage_target(generic_target): hash_function=self.settings["hash_function"],verbose=False) def set_snapcache_path(self): - if "SNAPCACHE" in self.settings: + if "snapcache" in self.settings["options"]: self.settings["snapshot_cache_path"]=\ normpath(self.settings["snapshot_cache"]+"/"+\ self.settings["snapshot"]+"/") @@ -449,7 +449,7 @@ class generic_stage_target(generic_target): "/tmp/"+self.settings["rel_type"]+"/"+".autoresume-"+\ self.settings["target"]+"-"+self.settings["subarch"]+"-"+\ self.settings["version_stamp"]+"/") - if "AUTORESUME" in self.settings: + if "autoresume" in self.settings["options"]: print "The autoresume path is " + self.settings["autoresume_path"] if not os.path.exists(self.settings["autoresume_path"]): os.makedirs(self.settings["autoresume_path"],0755) @@ -476,8 +476,8 @@ class generic_stage_target(generic_target): "base_dirs","bind","chroot_setup","setup_environment",\ "run_local","preclean","unbind","clean"] # if "TARBALL" in self.settings or \ -# "FETCH" not in self.settings: - if "FETCH" not in self.settings: +# "fetch" not in self.settings["options"]: + if "fetch" not in self.settings["options"]: self.settings["action_sequence"].append("capture") self.settings["action_sequence"].append("clear_autoresume") @@ -636,7 +636,7 @@ class generic_stage_target(generic_target): clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+\ "unpack") - if "SEEDCACHE" in self.settings: + if "seedcache" in self.settings["options"]: if os.path.isdir(self.settings["source_path"]): """ SEEDCACHE Is a directory, use rsync """ unpack_cmd="rsync -a --delete "+self.settings["source_path"]+\ @@ -678,7 +678,7 @@ class generic_stage_target(generic_target): error_msg="Tarball extraction of "+self.settings["source_path"]+\ " to "+self.settings["chroot_path"]+" failed." - if "AUTORESUME" in self.settings: + if "autoresume" in self.settings["options"]: if os.path.isdir(self.settings["source_path"]) \ and os.path.exists(self.settings["autoresume_path"]+"unpack"): """ Autoresume is valid, SEEDCACHE is valid """ @@ -705,7 +705,7 @@ class generic_stage_target(generic_target): invalid_snapshot=True else: """ No autoresume, SEEDCACHE """ - if "SEEDCACHE" in self.settings: + if "seedcache" in self.settings["options"]: """ SEEDCACHE so let's run rsync and let it clean up """ if os.path.isdir(self.settings["source_path"]): unpack=True @@ -729,7 +729,7 @@ class generic_stage_target(generic_target): self.mount_safety_check() if invalid_snapshot: - if "AUTORESUME" in self.settings: + if "autoresume" in self.settings["options"]: print "No Valid Resume point detected, cleaning up..." self.clear_autoresume() @@ -741,11 +741,11 @@ class generic_stage_target(generic_target): if not os.path.exists(self.settings["chroot_path"]+"/tmp"): os.makedirs(self.settings["chroot_path"]+"/tmp",1777) - if "PKGCACHE" in self.settings: + if "pkgcache" in self.settings["options"]: if not os.path.exists(self.settings["pkgcache_path"]): os.makedirs(self.settings["pkgcache_path"],0755) - if "KERNCACHE" in self.settings: + if "kerncache" in self.settings["options"]: if not os.path.exists(self.settings["kerncache_path"]): os.makedirs(self.settings["kerncache_path"],0755) @@ -766,7 +766,7 @@ class generic_stage_target(generic_target): snapshot_hash=read_from_clst(self.settings["autoresume_path"]+\ "unpack_portage") - if "SNAPCACHE" in self.settings: + if "snapcache" in self.settings["options"]: snapshot_cache_hash=\ read_from_clst(self.settings["snapshot_cache_path"]+\ "catalyst-hash") @@ -798,7 +798,7 @@ class generic_stage_target(generic_target): self.settings["chroot_path"]+"/usr" unpack_errmsg="Error unpacking snapshot" - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["chroot_path"]+\ self.settings["portdir"]) \ and os.path.exists(self.settings["autoresume_path"]\ @@ -809,7 +809,7 @@ class generic_stage_target(generic_target): unpack=False if unpack: - if "SNAPCACHE" in self.settings: + if "snapcache" in self.settings["options"]: self.snapshot_lock_object.write_lock() if os.path.exists(destdir): print cleanup_msg @@ -821,7 +821,7 @@ class generic_stage_target(generic_target): print "Unpacking portage tree (This can take a long time) ..." cmd(unpack_cmd,unpack_errmsg,env=self.env) - if "SNAPCACHE" in self.settings: + if "snapcache" in self.settings["options"]: myf=open(self.settings["snapshot_cache_path"]+"catalyst-hash","w") myf.write(self.settings["snapshot_path_hash"]) myf.close() @@ -831,11 +831,11 @@ class generic_stage_target(generic_target): myf.write(self.settings["snapshot_path_hash"]) myf.close() - if "SNAPCACHE" in self.settings: + if "snapcache" in self.settings["options"]: self.snapshot_lock_object.unlock() def config_profile_link(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+\ "config_profile_link"): print \ @@ -854,7 +854,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"config_profile_link") def setup_confdir(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+\ "setup_confdir"): print "Resume point detected, skipping setup_confdir operation..." @@ -904,7 +904,7 @@ class generic_stage_target(generic_target): os.makedirs(self.mountmap[x],0755) src=self.mountmap[x] - if "SNAPCACHE" in self.settings and x == "/usr/portage": + if "snapcache" in self.settings["options"] and x == "portdir": self.snapshot_lock_object.read_lock() if os.uname()[0] == "FreeBSD": if src == "/dev": @@ -954,7 +954,7 @@ class generic_stage_target(generic_target): ouch=1 warn("Couldn't umount bind mount: " + mypath + self.mountmap[x]) - if "SNAPCACHE" in self.settings and x == "/usr/portage": + if "snapcache" in self.settings["options"] and x == "portdir": try: """ It's possible the snapshot lock object isn't created yet. @@ -981,7 +981,7 @@ class generic_stage_target(generic_target): self.override_cflags() self.override_cxxflags() self.override_ldflags() - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"chroot_setup"): print "Resume point detected, skipping chroot_setup operation..." else: @@ -993,10 +993,10 @@ class generic_stage_target(generic_target): "Could not copy resolv.conf into place.",env=self.env) """ Copy over the envscript, if applicable """ - if "ENVSCRIPT" in self.settings: - if not os.path.exists(self.settings["ENVSCRIPT"]): + if "envscript" in self.settings: + if not os.path.exists(self.settings["envscript"]): raise CatalystError,\ - "Can't find envscript "+self.settings["ENVSCRIPT"] + "Can't find envscript "+self.settings["envscript"] print "\nWarning!!!!" print "\tOverriding certain env variables may cause catastrophic failure." @@ -1006,7 +1006,7 @@ class generic_stage_target(generic_target): print "\tCatalyst Maintainers use VERY minimal envscripts if used at all" print "\tYou have been warned\n" - cmd("cp "+self.settings["ENVSCRIPT"]+" "+\ + cmd("cp "+self.settings["envscript"]+" "+\ self.settings["chroot_path"]+"/tmp/envscript",\ "Could not copy envscript into place.",env=self.env) @@ -1077,7 +1077,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"chroot_setup") def fsscript(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"fsscript"): print "Resume point detected, skipping fsscript operation..." else: @@ -1088,7 +1088,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"fsscript") def rcupdate(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"rcupdate"): print "Resume point detected, skipping rcupdate operation..." else: @@ -1098,7 +1098,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"rcupdate") def clean(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"clean"): print "Resume point detected, skipping clean operation..." else: @@ -1133,7 +1133,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"clean") def empty(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"empty"): print "Resume point detected, skipping empty operation..." else: @@ -1161,7 +1161,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"empty") def remove(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"remove"): print "Resume point detected, skipping remove operation..." else: @@ -1183,7 +1183,7 @@ class generic_stage_target(generic_target): raise def preclean(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"preclean"): print "Resume point detected, skipping preclean operation..." else: @@ -1198,7 +1198,7 @@ class generic_stage_target(generic_target): raise CatalystError, "Build failed, could not execute preclean" def capture(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"capture"): print "Resume point detected, skipping capture operation..." else: @@ -1223,7 +1223,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"capture") def run_local(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"run_local"): print "Resume point detected, skipping run_local operation..." else: @@ -1272,10 +1272,10 @@ class generic_stage_target(generic_target): """ Check for mounts right away and abort if we cannot unmount them """ self.mount_safety_check() - if "CLEAR_AUTORESUME" in self.settings: + if "clear-autoresume" in self.settings["options"]: self.clear_autoresume() - if "PURGETMPONLY" in self.settings: + if "purgetmponly" in self.settings["options"]: self.purge() return @@ -1283,7 +1283,7 @@ class generic_stage_target(generic_target): self.purge() return - if "PURGE" in self.settings: + if "purge" in self.settings["options"]: self.purge() for x in self.settings["action_sequence"]: @@ -1298,7 +1298,7 @@ class generic_stage_target(generic_target): self.chroot_lock.unlock() def unmerge(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"unmerge"): print "Resume point detected, skipping unmerge operation..." else: @@ -1330,7 +1330,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"unmerge") def target_setup(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"target_setup"): print "Resume point detected, skipping target_setup operation..." else: @@ -1341,7 +1341,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"target_setup") def setup_overlay(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"setup_overlay"): print "Resume point detected, skipping setup_overlay operation..." else: @@ -1355,7 +1355,7 @@ class generic_stage_target(generic_target): touch(self.settings["autoresume_path"]+"setup_overlay") def create_iso(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"create_iso"): print "Resume point detected, skipping create_iso operation..." else: @@ -1372,13 +1372,13 @@ class generic_stage_target(generic_target): print "An ISO Image will not be created." def build_packages(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+\ "build_packages"): print "Resume point detected, skipping build_packages operation..." else: if self.settings["spec_prefix"]+"/packages" in self.settings: - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+\ "build_packages"): print "Resume point detected, skipping build_packages operation..." @@ -1397,8 +1397,7 @@ class generic_stage_target(generic_target): "build aborting due to error." def build_kernel(self): - "Build all configured kernels" - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"build_kernel"): print "Resume point detected, skipping build_kernel operation..." else: @@ -1423,7 +1422,7 @@ class generic_stage_target(generic_target): def _build_kernel(self, kname): "Build a single configured kernel by name" - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]\ +"build_kernel_"+kname): print "Resume point detected, skipping build_kernel for "+kname+" operation..." @@ -1521,7 +1520,7 @@ class generic_stage_target(generic_target): "/initramfs_overlay"],env=self.env) def bootloader(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"bootloader"): print "Resume point detected, skipping bootloader operation..." else: @@ -1535,7 +1534,7 @@ class generic_stage_target(generic_target): raise CatalystError,"Script aborting due to error." def livecd_update(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+\ "livecd_update"): print "Resume point detected, skipping build_packages operation..." @@ -1568,7 +1567,7 @@ class generic_stage_target(generic_target): os.chmod(myemp,mystat[ST_MODE]) def clear_packages(self): - if "PKGCACHE" in self.settings: + if "pkgcache" in self.settings["options"]: print "purging the pkgcache ..." myemp=self.settings["pkgcache_path"] @@ -1586,7 +1585,7 @@ class generic_stage_target(generic_target): os.chmod(myemp,mystat[ST_MODE]) def clear_kerncache(self): - if "KERNCACHE" in self.settings: + if "kerncache" in self.settings["options"]: print "purging the kerncache ..." myemp=self.settings["kerncache_path"] @@ -1605,11 +1604,11 @@ class generic_stage_target(generic_target): def clear_autoresume(self): """ Clean resume points since they are no longer needed """ - if "AUTORESUME" in self.settings: + if "autoresume" in self.settings["options"]: print "Removing AutoResume Points: ..." myemp=self.settings["autoresume_path"] if os.path.isdir(myemp): - if "AUTORESUME" in self.settings: + if "autoresume" in self.settings["options"]: print "Emptying directory",myemp """ stat the dir, delete the dir, recreate the dir and set @@ -1673,7 +1672,7 @@ class generic_stage_target(generic_target): def purge(self): countdown(10,"Purging Caches ...") - if any(k in self.settings for k in ("PURGE","PURGEONLY","PURGETMPONLY")): + if any(k in self.settings["options"] for k in ("purge","purgeonly","purgetmponly")): print "clearing autoresume ..." self.clear_autoresume() diff --git a/catalyst/targets/grp_target.py b/catalyst/targets/grp_target.py index 8e700429..a8309a81 100644 --- a/catalyst/targets/grp_target.py +++ b/catalyst/targets/grp_target.py @@ -36,7 +36,7 @@ class grp_target(generic_stage_target): def set_target_path(self): self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): print "Resume point detected, skipping target path setup operation..." else: diff --git a/catalyst/targets/livecd_stage1_target.py b/catalyst/targets/livecd_stage1_target.py index ac846ecb..6273c9e8 100644 --- a/catalyst/targets/livecd_stage1_target.py +++ b/catalyst/targets/livecd_stage1_target.py @@ -25,7 +25,7 @@ class livecd_stage1_target(generic_stage_target): def set_target_path(self): self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): print "Resume point detected, skipping target path setup operation..." else: diff --git a/catalyst/targets/livecd_stage2_target.py b/catalyst/targets/livecd_stage2_target.py index 7e924723..e89ed73b 100644 --- a/catalyst/targets/livecd_stage2_target.py +++ b/catalyst/targets/livecd_stage2_target.py @@ -46,7 +46,7 @@ class livecd_stage2_target(generic_stage_target): def set_target_path(self): self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): print "Resume point detected, skipping target path setup operation..." else: @@ -85,7 +85,7 @@ class livecd_stage2_target(generic_stage_target): error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." invalid_snapshot=False - if "AUTORESUME" in self.settings: + if "autoresume" in self.settings["options"]: if os.path.isdir(self.settings["source_path"]) and \ os.path.exists(self.settings["autoresume_path"]+"unpack"): print "Resume point detected, skipping unpack operation..." @@ -109,7 +109,7 @@ class livecd_stage2_target(generic_stage_target): if not os.path.exists(self.settings["chroot_path"]+"/tmp"): os.makedirs(self.settings["chroot_path"]+"/tmp",1777) - if "PKGCACHE" in self.settings: + if "pkgcache" in self.settings["options"]: if not os.path.exists(self.settings["pkgcache_path"]): os.makedirs(self.settings["pkgcache_path"],0755) @@ -131,7 +131,7 @@ class livecd_stage2_target(generic_stage_target): "config_profile_link","setup_confdir","portage_overlay",\ "bind","chroot_setup","setup_environment","run_local",\ "build_kernel"] - if "FETCH" not in self.settings: + if "fetch" not in self.settings["options"]: self.settings["action_sequence"] += ["bootloader","preclean",\ "livecd_update","root_overlay","fsscript","rcupdate","unmerge",\ "unbind","remove","empty","target_setup",\ diff --git a/catalyst/targets/netboot2_target.py b/catalyst/targets/netboot2_target.py index 2b3cd208..8809dd0f 100644 --- a/catalyst/targets/netboot2_target.py +++ b/catalyst/targets/netboot2_target.py @@ -45,7 +45,7 @@ class netboot2_target(generic_stage_target): def set_target_path(self): self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+\ self.settings["target_subpath"]+"/") - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): print "Resume point detected, skipping target path setup operation..." else: @@ -63,7 +63,7 @@ class netboot2_target(generic_stage_target): myfiles=[] # check for autoresume point - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"copy_files_to_image"): print "Resume point detected, skipping target path setup operation..." else: @@ -96,7 +96,7 @@ class netboot2_target(generic_stage_target): touch(self.settings["autoresume_path"]+"copy_files_to_image") def setup_overlay(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"setup_overlay"): print "Resume point detected, skipping setup_overlay operation..." else: @@ -120,7 +120,7 @@ class netboot2_target(generic_stage_target): raise CatalystError,"Failed to move kernel images!" def remove(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"remove"): print "Resume point detected, skipping remove operation..." else: @@ -132,7 +132,7 @@ class netboot2_target(generic_stage_target): os.system("rm -rf " + self.settings["chroot_path"] + self.settings["merge_path"] + x) def empty(self): - if "AUTORESUME" in self.settings \ + if "autoresume" in self.settings["options"] \ and os.path.exists(self.settings["autoresume_path"]+"empty"): print "Resume point detected, skipping empty operation..." else: diff --git a/catalyst/targets/snapshot_target.py b/catalyst/targets/snapshot_target.py index 9214eb07..0329a612 100644 --- a/catalyst/targets/snapshot_target.py +++ b/catalyst/targets/snapshot_target.py @@ -32,11 +32,11 @@ class snapshot_target(generic_stage_target): pass def run(self): - if "PURGEONLY" in self.settings: + if "purgeonly" in self.settings["options"]: self.purge() return - if "PURGE" in self.settings: + if "purge" in self.settings["options"]: self.purge() self.setup() diff --git a/catalyst/targets/stage2_target.py b/catalyst/targets/stage2_target.py index 6377f5da..94d4a1e7 100644 --- a/catalyst/targets/stage2_target.py +++ b/catalyst/targets/stage2_target.py @@ -16,7 +16,7 @@ class stage2_target(generic_stage_target): generic_stage_target.__init__(self,spec,addlargs) def set_source_path(self): - if "SEEDCACHE" in self.settings and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")): + if "seedcache" in self.settings["options"] and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")): self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/") else: self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") diff --git a/catalyst/targets/stage4_target.py b/catalyst/targets/stage4_target.py index 9168f2ee..e2b8a79a 100644 --- a/catalyst/targets/stage4_target.py +++ b/catalyst/targets/stage4_target.py @@ -32,8 +32,8 @@ class stage4_target(generic_stage_target): "clean"] # if "TARBALL" in self.settings or \ -# "FETCH" not in self.settings: - if "FETCH" not in self.settings: +# "fetch" not in self.settings['options']: + if "fetch" not in self.settings['options']: self.settings["action_sequence"].append("capture") self.settings["action_sequence"].append("clear_autoresume") -- 2.26.2