View | Details | Raw Unified
Collapse All | Expand All

(-) modules/generic_stage_target.py.orig (-5 / +15 lines)
 Lines 572-583   class generic_stage_target(generic_targe Link Here 
		clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack")
		clst_unpack_hash=read_from_clst(self.settings["autoresume_path"]+"unpack")
		
		
		if self.settings.has_key("SEEDCACHE") and os.path.isdir(self.settings["source_path"]): 
		if self.settings.has_key("SEEDCACHE"):
			unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"]
			if os.path.isdir(self.settings["source_path"]): 
			display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\
				# SEEDCACHE Is a directory, use Rsync
				self.settings["chroot_path"]+" (This may take some time) ...\n"
				unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"]
			error_msg="Rsync of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed."
				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."
			else:
				# SEEDCACHE is a not a directory, try untar'ing
				print "Referenced SEEDCACHE does not appear to be a directory, trying to untar..."
				display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\
					self.settings["chroot_path"]+" (This may take some time) ...\n"
				unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"]
				error_msg="Tarball extraction of "+self.settings["source_path"]+" to "+self.settings["chroot_path"]+" failed."
		else:
		else:
			# No SEEDCACHE, use tar
			display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\
			display_msg="\nStarting tar extract from "+self.settings["source_path"]+"\nto "+\
				self.settings["chroot_path"]+" (This may take some time) ...\n"
				self.settings["chroot_path"]+" (This may take some time) ...\n"
			unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"]
			unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+self.settings["chroot_path"]