From: Eric Edgar Date: Mon, 10 Oct 2005 20:38:03 +0000 (+0000) Subject: update autoresume logic when dealing with rsync unpack operations X-Git-Tag: CATALYST_2_0_6_916~636 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=95d96df8ebde0b5144c1f34eed0bd10806edcc14;p=catalyst.git update autoresume logic when dealing with rsync unpack operations git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@858 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index f50c9a9d..28ede4bc 100644 --- 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.350 2005/10/10 20:16:52 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.351 2005/10/10 20:38:03 rocket Exp $ + + 10 Oct 2005; Eric Edgar + modules/generic_stage_target.py: + update autoresume logic when dealing with rsync unpack operations 10 Oct 2005; Eric Edgar targets/support/post-kmerge.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index c0c27fb0..88833757 100644 --- 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.64 2005/10/10 19:22:26 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.65 2005/10/10 20:38:03 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -491,7 +491,7 @@ class generic_stage_target(generic_target): if self.settings.has_key("AUTORESUME"): - if self.settings.has_key("SEEDCACHE") and \ + 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