[patch] Updated patch.

livecd-stage2.patch (text/plain), 1.09 KB, created by Sven Rubben on 2005-01-03 11:35:55 UTC

--- livecd_stage2_target.py.orig	2004-12-11 03:14:12.000000000 +0100
+++ livecd_stage2_target.py	2005-01-03 18:32:47.000000000 +0100
@@ -120,17 +120,18 @@
 			
 			for x in self.settings["livecd/empty"]:
 				myemp=self.settings["chroot_path"]+x
-				if not os.path.isdir(myemp):
+				if not os.path.isdir(myemp) or os.path.islink(myemp):
 					print x,"not a directory or does not exist, skipping 'empty' operation."
-					continue
-				print "Emptying directory",x
-				# stat the dir, delete the dir, recreate the dir and set 
-				# the proper perms and ownership
-				mystat=os.stat(myemp)
-				shutil.rmtree(myemp)
-				os.makedirs(myemp)
-				os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
-				os.chmod(myemp,mystat[ST_MODE])
+				
+				else:
+					print "Emptying directory",x
+					# stat the dir, delete the dir, recreate the dir and set 
+					# the proper perms and ownership
+					mystat=os.stat(myemp)
+					shutil.rmtree(myemp)
+					os.makedirs(myemp)
+					os.chown(myemp,mystat[ST_UID],mystat[ST_GID])
+					os.chmod(myemp,mystat[ST_MODE])
 			
 		if self.settings.has_key("livecd/rm"):