From 652d6fd001d155eb6097821feaa1e0c62d5fe45e Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 20 Jan 2006 14:32:07 +0000 Subject: [PATCH] Added fix for bug #119635. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1034 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 fab3294d..c5833b68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.519 2006/01/19 23:15:56 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.520 2006/01/20 14:32:07 wolf31o2 Exp $ + + 20 Jan 2006; Chris Gianelloni + modules/generic_stage_target.py: + Added fix for bug #119635. 19 Jan 2006; Eric Edgar targets/support/pre-kmerge.sh: Fix pre-kmerge.sh for stage4 diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 976f6cff..ef8b5026 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.119 2006/01/18 14:10:23 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.120 2006/01/20 14:32:07 wolf31o2 Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -351,7 +351,7 @@ class generic_stage_target(generic_target): if os.path.isdir(self.settings["source_path"]): print "Source path set to "+self.settings["source_path"] print "\tIf this is not desired, remove this directory or turn of seedcache in the options of catalyst.conf" - print "\tthe source path with then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2\n") + print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2\n") else: print "Source path set to "+self.settings["source_path"] -- 2.26.2