[patch] Patch to check if settings are of type list or string before appending or extending

generic_stage_target.py_patch (text/plain), 2.20 KB, created by REdOG on 2004-09-30 12:05:34 UTC

--- /usr/lib/catalyst/modules/generic_stage_target.py	2004-09-30 13:51:47.618506656 -0500
+++ usr/lib/catalyst/modules/generic_stage_target.py	2004-09-30 13:42:59.738756576 -0500
@@ -288,32 +288,44 @@
 		myf.write("# Please consult /etc/make.conf.example for a more detailed example\n")
 		myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n')
 		myf.write('CHOST="'+self.settings["CHOST"]+'"\n')
-		
+
 		# figure out what our USE vars are for building
 		myusevars=[]
 		if self.settings.has_key("HOSTUSE"):
-			myusevars.extend(self.settings["HOSTUSE"])
-			
+			if type(self.settings.has_key("HOSTUSE"))==str:
+				myusevars.append(self.settings["HOSTUSE"])
+			elif type(self.settings.has_key("HOSTUSE"))==list:
+				myusevars.extend(self.settings["HOSTUSE"])
+
 		if self.settings["target"]=="grp":
 			myusevars.append("bindist")
-			myusevars.extend(self.settings["grp/use"])
+			if type(self.settings("grp/use"))==str:
+				myusevars.append(self.settings["grp/use"])
+			elif type(self.settings.has_key("grp/use"))==list:
+				myusevars.extend(self.settings["grp/use"])
 			myf.write('USE="'+string.join(myusevars)+'"\n')
-			
+
 		elif self.settings["target"]=="tinderbox":
-			myusevars.extend(self.settings["tinderbox/use"])
+			if type(self.settings("tinderbox/use"))==str:
+				myusevars.append(self.settings["tinderbox/use"])
+			elif type(self.settings.has_key("tinderbox/use"))==list:
+				myusevars.extend(self.settings["tinderbox/use"])
 			myf.write('USE="'+string.join(myusevars)+'"\n')
-			
+
 		elif self.settings["target"]=="livecd-stage1":
-			myusevars.extend(self.settings["livecd/use"])
+			myusevars.append(self.settings["livecd/use"])
 			myf.write('USE="'+string.join(myusevars)+'"\n')
 			
 		elif self.settings["target"]=="embedded":
-			myusevars.extend(self.settings["embedded/use"])
+			if type(self.settings("embedded/use"))==str:
+				myusevars.append(self.settings["embedded/use"])
+			elif type(self.settings("embedded/use"))==list:
+				myusevars.extend(self.settings["embedded/use"])
 			myf.write('USE="'+string.join(myusevars)+'"\n')
-			
+
 		if self.settings.has_key("CXXFLAGS"):
 			myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n')
-		
+
 		else:
 			myf.write('CXXFLAGS="${CFLAGS}"\n')
 		myf.close()