[patch] new patch

catalyst.patch (text/plain), 14.57 KB, created by Andrew Gaffney (RETIRED) on 2007-01-17 15:42:03 UTC

Index: modules/stage3_target.py
===================================================================
--- modules/stage3_target.py	(revision 1206)
+++ modules/stage3_target.py	(working copy)
@@ -12,13 +12,13 @@
 		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})
Index: modules/grp_target.py
===================================================================
--- modules/grp_target.py	(revision 1206)
+++ modules/grp_target.py	(working copy)
@@ -32,18 +32,18 @@
 		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):
Index: modules/embedded_target.py
===================================================================
--- modules/embedded_target.py	(revision 1206)
+++ modules/embedded_target.py	(working copy)
@@ -16,32 +16,32 @@
 
 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")
+	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)
+		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 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})
Index: modules/tinderbox_target.py
===================================================================
--- modules/tinderbox_target.py	(revision 1206)
+++ modules/tinderbox_target.py	(working copy)
@@ -26,21 +26,21 @@
 			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})
Index: modules/generic_stage_target.py
===================================================================
--- modules/generic_stage_target.py	(revision 1206)
+++ modules/generic_stage_target.py	(working copy)
@@ -263,8 +263,8 @@
 			# 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/")
Index: modules/catalyst_support.py
===================================================================
--- modules/catalyst_support.py	(revision 1206)
+++ modules/catalyst_support.py	(working copy)
@@ -54,12 +54,12 @@
 # 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):
Index: modules/livecd_stage1_target.py
===================================================================
--- modules/livecd_stage1_target.py	(revision 1206)
+++ modules/livecd_stage1_target.py	(working copy)
@@ -56,10 +56,10 @@
 		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):
Index: modules/livecd_stage2_target.py
===================================================================
--- modules/livecd_stage2_target.py	(revision 1206)
+++ modules/livecd_stage2_target.py	(working copy)
@@ -71,60 +71,59 @@
 			myf.close()
 	
 	def unpack(self):
-                unpack=True
+		unpack=True
 		display_msg=None
 
-                clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack")
+		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 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 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 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"]):
+				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 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 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)
+			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")
+			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",\
 				"config_profile_link","setup_confdir","portage_overlay",\