Fix autoresume for unpacking tarballs

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@928 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 6405a9c7d1a50fb65be15efb47ebb49ce338c49c..a6dcde9fd95fb33171d6d06f428e4c0539f7b124 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.415 2005/12/02 15:21:05 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.416 2005/12/02 16:32:32 rocket Exp $
+
+  02 Dec 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  Fix autoresume for unpacking tarballs
 
   02 Dec 2005; Eric Edgar <rocket@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index b1ad64203518ad212957f4d455a478fd97221d04..9c744b52fa4b6fdbae74276f8dca908d4ba293cb 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.83 2005/12/02 15:14:27 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.84 2005/12/02 16:32:32 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -515,18 +515,22 @@ class generic_stage_target(generic_target):
                                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."
-                       invalid_snapshot=True
+                       invalid_snapshot=False
+                       unpack=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_md5sum"):
                        if self.settings["source_path_md5sum"] != clst_unpack_md5sum:
                                invalid_snapshot=True
-                       
+                               unpack=True
+               
+               if not unpack:
+                   print "Resume point detected, skipping unpack operation..."
+
                if unpack:
                        self.mount_safety_check()