From 9a8ece65952a21ed125c135294f07835ada44923 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 23 Jan 2007 17:08:22 +0000 Subject: [PATCH] Added patch from Andrew Gaffney to fix up some of the tab/space nastiness. This is for bug #161915. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1208 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++ modules/catalyst_support.py | 12 ++--- modules/embedded_target.py | 38 +++++++------- modules/generic_stage_target.py | 4 +- modules/grp_target.py | 24 ++++----- modules/livecd_stage1_target.py | 4 +- modules/livecd_stage2_target.py | 91 ++++++++++++++++----------------- modules/stage3_target.py | 14 ++--- modules/tinderbox_target.py | 20 ++++---- 9 files changed, 111 insertions(+), 104 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a042a4a..d06bd326 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 23 Jan 2007; Chris Gianelloni + modules/catalyst_support.py, modules/embedded_target.py, + modules/generic_stage_target.py, modules/grp_target.py, + modules/livecd_stage1_target.py, modules/livecd_stage2_target.py, + modules/stage3_target.py, modules/tinderbox_target.py: + Added patch from Andrew Gaffney to fix up some of the + tab/space nastiness. This is for bug #161915. + 23 Jan 2007; Chris Gianelloni modules/generic_stage_target.py: Fixed new cbuild code with another patch from Mike Frysinger diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index 50e65903..aae71832 100644 --- a/modules/catalyst_support.py +++ b/modules/catalyst_support.py @@ -54,12 +54,12 @@ def cleanup(pids,block_exceptions=True): # a function to turn a string of non-printable characters into a string of # hex characters def hexify(str): - hexStr = string.hexdigits - r = '' - for ch in str: - i = ord(ch) - r = r + hexStr[(i >> 4) & 0xF] + hexStr[i & 0xF] - return r + hexStr = string.hexdigits + r = '' + for ch in str: + i = ord(ch) + r = r + hexStr[(i >> 4) & 0xF] + hexStr[i & 0xF] + return r # hexify() def generate_hash(file,hash_function="crc32",verbose=False): diff --git a/modules/embedded_target.py b/modules/embedded_target.py index 15a0f0c6..2ab8cc5a 100644 --- a/modules/embedded_target.py +++ b/modules/embedded_target.py @@ -16,32 +16,32 @@ from stat import * class embedded_target(generic_stage_target): - def __init__(self,spec,addlargs): - self.required_values=[] - self.valid_values=[] - self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/fs-prepare","embedded/fs-finish","embedded/mergeroot","embedded/packages","embedded/fs-type","embedded/runscript","boot/kernel","embedded/linuxrc"]) - self.valid_values.extend(["embedded/use"]) - if addlargs.has_key("embedded/fs-type"): - self.valid_values.append("embedded/fs-ops") - - generic_stage_target.__init__(self,spec,addlargs) - self.set_build_kernel_vars(addlargs) - - def set_action_sequence(self): - self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ + def __init__(self,spec,addlargs): + self.required_values=[] + self.valid_values=[] + self.valid_values.extend(["embedded/empty","embedded/rm","embedded/unmerge","embedded/fs-prepare","embedded/fs-finish","embedded/mergeroot","embedded/packages","embedded/fs-type","embedded/runscript","boot/kernel","embedded/linuxrc"]) + self.valid_values.extend(["embedded/use"]) + if addlargs.has_key("embedded/fs-type"): + self.valid_values.append("embedded/fs-ops") + + generic_stage_target.__init__(self,spec,addlargs) + self.set_build_kernel_vars(addlargs) + + def set_action_sequence(self): + self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ "config_profile_link","setup_confdir",\ "portage_overlay","bind","chroot_setup",\ "setup_environment","build_kernel","build_packages",\ "bootloader","root_overlay","fsscript","unmerge",\ "unbind","remove","empty","clean","capture","clear_autoresume"] - def set_stage_path(self): - self.settings["stage_path"]=normpath(self.settings["chroot_path"]+"/tmp/mergeroot") - print "embedded stage path is "+self.settings["stage_path"] + def set_stage_path(self): + self.settings["stage_path"]=normpath(self.settings["chroot_path"]+"/tmp/mergeroot") + print "embedded stage path is "+self.settings["stage_path"] - def set_root_path(self): - self.settings["root_path"]=normpath("/tmp/mergeroot") - print "embedded root path is "+self.settings["root_path"] + def set_root_path(self): + self.settings["root_path"]=normpath("/tmp/mergeroot") + print "embedded root path is "+self.settings["root_path"] def register(foo): foo.update({"embedded":embedded_target}) diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index d70ee716..b9cb3c3f 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -266,8 +266,8 @@ class generic_stage_target(generic_target): # first clean up any existing target stuff if os.path.isfile(self.settings["target_path"]): cmd("rm -f "+self.settings["target_path"], \ - "Could not remove existing file: "+self.settings["target_path"],env=self.env) - touch(self.settings["autoresume_path"]+"setup_target_path") + "Could not remove existing file: "+self.settings["target_path"],env=self.env) + touch(self.settings["autoresume_path"]+"setup_target_path") if not os.path.exists(self.settings["storedir"]+"/builds/"): os.makedirs(self.settings["storedir"]+"/builds/") diff --git a/modules/grp_target.py b/modules/grp_target.py index 9cea0e47..f2fb5470 100644 --- a/modules/grp_target.py +++ b/modules/grp_target.py @@ -32,18 +32,18 @@ class grp_target(generic_stage_target): generic_stage_target.__init__(self,spec,addlargs) def set_target_path(self): - self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") - if self.settings.has_key("AUTORESUME") \ - and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): - print "Resume point detected, skipping target path setup operation..." - else: - # first clean up any existing target stuff - #if os.path.isdir(self.settings["target_path"]): - #cmd("rm -rf "+self.settings["target_path"], - #"Could not remove existing directory: "+self.settings["target_path"],env=self.env) - if not os.path.exists(self.settings["target_path"]): - os.makedirs(self.settings["target_path"]) - + self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/") + if self.settings.has_key("AUTORESUME") \ + and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"): + print "Resume point detected, skipping target path setup operation..." + else: + # first clean up any existing target stuff + #if os.path.isdir(self.settings["target_path"]): + #cmd("rm -rf "+self.settings["target_path"], + #"Could not remove existing directory: "+self.settings["target_path"],env=self.env) + if not os.path.exists(self.settings["target_path"]): + os.makedirs(self.settings["target_path"]) + touch(self.settings["autoresume_path"]+"setup_target_path") def run_local(self): diff --git a/modules/livecd_stage1_target.py b/modules/livecd_stage1_target.py index 46ccbd9b..5e989d0b 100644 --- a/modules/livecd_stage1_target.py +++ b/modules/livecd_stage1_target.py @@ -56,10 +56,10 @@ class livecd_stage1_target(generic_stage_target): self.settings[self.settings["spec_prefix"]+"/packages"].append("app-misc/livecd-tools") def set_pkgcache_path(self): - if self.settings.has_key("pkgcache_path"): + if self.settings.has_key("pkgcache_path"): if type(self.settings["pkgcache_path"]) != types.StringType: self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) - else: + else: generic_stage_target.set_pkgcache_path(self) def register(foo): diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index dd4de7a0..9ce6334d 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -71,59 +71,58 @@ class livecd_stage2_target(generic_stage_target): myf.close() def unpack(self): - unpack=True + unpack=True display_msg=None - clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack") - - if os.path.isdir(self.settings["source_path"]): - unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"] - display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\ - self.settings["chroot_path"]+" (This may take some time) ...\n" - error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." - invalid_snapshot=False - - if self.settings.has_key("AUTORESUME"): - if os.path.isdir(self.settings["source_path"]) and \ - os.path.exists(self.settings["autoresume_path"]+"unpack"): - print "Resume point detected, skipping unpack operation..." - unpack=False - elif self.settings.has_key("source_path_hash"): - if self.settings["source_path_hash"] != clst_unpack_hash: - invalid_snapshot=True - - if unpack: - self.mount_safety_check() - if invalid_snapshot: - print "No Valid Resume point detected, cleaning up ..." - #os.remove(self.settings["autoresume_path"]+"dir_setup") - self.clear_autoresume() - self.clear_chroot() - #self.dir_setup() - - if not os.path.exists(self.settings["chroot_path"]): - os.makedirs(self.settings["chroot_path"]) - - if not os.path.exists(self.settings["chroot_path"]+"/tmp"): - os.makedirs(self.settings["chroot_path"]+"/tmp",1777) - - if self.settings.has_key("PKGCACHE"): - if not os.path.exists(self.settings["pkgcache_path"]): - os.makedirs(self.settings["pkgcache_path"],0755) + clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack") + + if os.path.isdir(self.settings["source_path"]): + unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"] + display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\ + self.settings["chroot_path"]+" (This may take some time) ...\n" + error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed." + invalid_snapshot=False + + if self.settings.has_key("AUTORESUME"): + if os.path.isdir(self.settings["source_path"]) and \ + os.path.exists(self.settings["autoresume_path"]+"unpack"): + print "Resume point detected, skipping unpack operation..." + unpack=False + elif self.settings.has_key("source_path_hash"): + if self.settings["source_path_hash"] != clst_unpack_hash: + invalid_snapshot=True + + if unpack: + self.mount_safety_check() + if invalid_snapshot: + print "No Valid Resume point detected, cleaning up ..." + #os.remove(self.settings["autoresume_path"]+"dir_setup") + self.clear_autoresume() + self.clear_chroot() + #self.dir_setup() + + if not os.path.exists(self.settings["chroot_path"]): + os.makedirs(self.settings["chroot_path"]) + + if not os.path.exists(self.settings["chroot_path"]+"/tmp"): + os.makedirs(self.settings["chroot_path"]+"/tmp",1777) + + if self.settings.has_key("PKGCACHE"): + if not os.path.exists(self.settings["pkgcache_path"]): + os.makedirs(self.settings["pkgcache_path"],0755) if not display_msg: raise CatalystError,"Could not find appropriate source. Please check the 'source_subpath' setting in the spec file." - print display_msg - cmd(unpack_cmd,error_msg,env=self.env) - - if self.settings.has_key("source_path_hash"): - myf=open(self.settings["autoresume_path"]+"unpack","w") - myf.write(self.settings["source_path_hash"]) - myf.close() - else: - touch(self.settings["autoresume_path"]+"unpack") + print display_msg + cmd(unpack_cmd,error_msg,env=self.env) + if self.settings.has_key("source_path_hash"): + myf=open(self.settings["autoresume_path"]+"unpack","w") + myf.write(self.settings["source_path_hash"]) + myf.close() + else: + touch(self.settings["autoresume_path"]+"unpack") def set_action_sequence(self): self.settings["action_sequence"]=["unpack","unpack_snapshot",\ diff --git a/modules/stage3_target.py b/modules/stage3_target.py index cea2df97..41d0b318 100644 --- a/modules/stage3_target.py +++ b/modules/stage3_target.py @@ -12,13 +12,13 @@ class stage3_target(generic_stage_target): self.valid_values=[] generic_stage_target.__init__(self,spec,addlargs) - def set_portage_overlay(self): - generic_stage_target.set_portage_overlay(self) - if self.settings.has_key("portage_overlay"): - print "\nWARNING !!!!!" - print "\tUsing an overlay for earlier stages could cause build issues." - print "\tIf you break it, you buy it. Don't complain to us about it." - print "\tDont say we did not warn you\n" + def set_portage_overlay(self): + generic_stage_target.set_portage_overlay(self) + if self.settings.has_key("portage_overlay"): + print "\nWARNING !!!!!" + print "\tUsing an overlay for earlier stages could cause build issues." + print "\tIf you break it, you buy it. Don't complain to us about it." + print "\tDont say we did not warn you\n" def register(foo): foo.update({"stage3":stage3_target}) diff --git a/modules/tinderbox_target.py b/modules/tinderbox_target.py index 4824cc51..a1a66151 100644 --- a/modules/tinderbox_target.py +++ b/modules/tinderbox_target.py @@ -26,21 +26,21 @@ class tinderbox_target(generic_stage_target): raise CatalystError,"Tinderbox aborting due to error." def set_pkgcache_path(self): - if self.settings.has_key("pkgcache_path"): - if type(self.settings["pkgcache_path"]) != types.StringType: - self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) - else: - generic_stage_target.set_pkgcache_path(self) + if self.settings.has_key("pkgcache_path"): + if type(self.settings["pkgcache_path"]) != types.StringType: + self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) + else: + generic_stage_target.set_pkgcache_path(self) def set_cleanables(self): self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*",\ "/usr/portage"] def set_action_sequence(self): - #Default action sequence for run method - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","bind","chroot_setup",\ - "setup_environment","run_local","preclean","unbind","clean",\ - "clear_autoresume"] + #Default action sequence for run method + self.settings["action_sequence"]=["unpack","unpack_snapshot",\ + "config_profile_link","setup_confdir","bind","chroot_setup",\ + "setup_environment","run_local","preclean","unbind","clean",\ + "clear_autoresume"] def register(foo): foo.update({"tinderbox":tinderbox_target}) -- 2.26.2