From a20483db4fc3b649c2d756de9f50f8d5c3de7352 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Fri, 9 Dec 2005 20:47:05 +0000 Subject: [PATCH] Fix stupid overlay bug git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@960 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 3614a983..f34ee5bd 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.447 2005/12/09 19:03:07 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.448 2005/12/09 20:47:05 rocket Exp $ + + 09 Dec 2005; Eric Edgar + modules/generic_stage_target.py: + Fix stupid overlay bug 09 Dec 2005; Chris Gianelloni catalyst, targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh, diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 34c890fc..e2546715 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.95 2005/12/09 16:18:23 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.96 2005/12/09 20:47:05 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -1041,7 +1041,7 @@ class generic_stage_target(generic_target): print "Resume point detected, skipping setup_overlay operation..." else: if self.settings.has_key(self.settings["spec_prefix"]+"/overlay") \ - and os.path.exists(self.settings["spec_prefix"]+"/overlay"): + and os.path.exists(self.settings[self.settings["spec_prefix"]+"/overlay"]): cmd("rsync -a "+self.settings[self.settings["spec_prefix"]+"/overlay"]+"/ "+\ self.settings["target_path"], self.settings["spec_prefix"]+"overlay copy failed.",env=self.env) touch(self.settings["autoresume_path"]+"setup_overlay") -- 2.26.2