From e45c26900c55d4487a532388785fc0089715d3f9 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Wed, 28 Dec 2005 11:56:17 +0000 Subject: [PATCH] Fix for bug 116305;removed unnecessary pkgcache_path processing from the stage4 target git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1003 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- modules/generic_stage_target.py | 6 +++++- modules/stage4_target.py | 9 +-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2917edf1..b5264e7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.490 2005/12/23 06:38:18 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.491 2005/12/28 11:56:17 rocket Exp $ + + 28 Dec 2005; Eric Edgar + modules/generic_stage_target.py, modules/stage4_target.py: + Fix for bug 116305;removed unnecessary pkgcache_path processing from the + stage4 target 23 Dec 2005; Eric Edgar arch/sh.py, modules/generic_stage_target.py, modules/stage4_target.py: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index ac6d5ce4..1d8df6fe 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.107 2005/12/23 06:38:18 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.108 2005/12/28 11:56:17 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -247,6 +247,10 @@ class generic_stage_target(generic_target): raise CatalystError, "source_subpath should have been a string. Perhaps you have something wrong in your spec file?" def set_pkgcache_path(self): + if self.settings.has_key("pkgcache_path"): + if type(self.settings["pkgcache_path"]) != types.StringType: + self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) + self.settings["pkgcache_path"]=normpath(self.settings["storedir"]+"/packages/"+\ self.settings["target_subpath"]+"/") diff --git a/modules/stage4_target.py b/modules/stage4_target.py index a222bdb6..edc6d69b 100644 --- a/modules/stage4_target.py +++ b/modules/stage4_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/stage4_target.py,v 1.14 2005/12/23 06:38:18 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage4_target.py,v 1.15 2005/12/28 11:56:17 rocket Exp $ """ Builder class for LiveCD stage1. @@ -17,13 +17,6 @@ class stage4_target(generic_stage_target): "stage4/rcadd","stage4/rcdel","chost","cflags","ldflags","cxxflags"]) generic_stage_target.__init__(self,spec,addlargs) - def set_pkgcache_path(self): - if self.settings.has_key("pkgcache_path"): - if type(self.settings["pkgcache_path"]) != types.StringType: - self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) - else: - generic_stage_target.set_pkgcache_path(self) - def set_cleanables(self): self.settings["cleanables"]=["/var/tmp/*","/tmp/*"] -- 2.26.2