From 05bda61fc4dc9e0960dfdcd2c759a54af07d9628 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Mon, 10 Oct 2005 19:14:18 +0000 Subject: [PATCH] fix livecd-stage2 unpack when seedcache is turned off git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@854 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/generic_stage_target.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index afa33cd7..747af3d7 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.346 2005/10/10 19:05:24 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.347 2005/10/10 19:14:18 rocket Exp $ + + 10 Oct 2005; Eric Edgar + modules/generic_stage_target.py: + fix livecd-stage2 unpack when seedcache is turned off 10 Oct 2005; Chris Gianelloni targets/support/functions.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 89cd3e65..a192f2db 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.62 2005/10/10 19:02:48 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.63 2005/10/10 19:14:18 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -476,7 +476,7 @@ class generic_stage_target(generic_target): clst_unpack_md5sum=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") or os.path.isdir(self.settings["source_path"]): unpack_cmd="rsync -a --delete "+self.settings["source_path"]+" "+self.settings["chroot_path"] display_msg="\nStarting rsync from "+self.settings["source_path"]+"\nto "+\ self.settings["chroot_path"]+" (This may take some time) ...\n" -- 2.26.2