Fix broken seedcache autoresume interaction

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

diff --git a/ChangeLog b/ChangeLog
index 2d061dc7f484b8300d9dd2ae3a1d63149a1ceb94..9ba4ae173b239ddcc8bed12ca90af94f8c0b2eed 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.344 2005/10/07 14:45:42 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.345 2005/10/10 19:02:48 rocket Exp $
+
+  10 Oct 2005; Eric Edgar <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  Fix broken seedcache autoresume interaction
 
   07 Oct 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 607aa9b451252c86b2398ef7a6ffad3de2b0a075..89cd3e65cba0c42a5e001317c853d622a638aee1 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.61 2005/10/07 14:45:42 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.62 2005/10/10 19:02:48 rocket Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -490,11 +490,12 @@ class generic_stage_target(generic_target):
                        invalid_snapshot=True
                
                
-               if self.settings.has_key("AUTORESUME") and self.settings.has_key("SNAPCACHE") \
-                       and os.path.exists(self.settings["autoresume_path"]+"unpack"):
-                       print "Resume point detected, skipping unpack operation..."
-                       unpack=False
-               elif self.settings.has_key("AUTORESUME") and self.settings.has_key("source_path_md5sum"):
+               if self.settings.has_key("AUTORESUME")
+                   if self.settings.has_key("SEEDCACHE") 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