From db44435db605f095d2e3d4d0aa3cba2c930b3438 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 21 Dec 2005 17:18:28 +0000 Subject: [PATCH] Make stage1 clean up python 2.3 and 2.4, also. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@998 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/stage1_target.py | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index fcc8c50a..c05ead2f 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.485 2005/12/21 16:56:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.486 2005/12/21 17:18:28 wolf31o2 Exp $ + + 21 Dec 2005; Chris Gianelloni + modules/stage1_target.py: + Make stage1 clean up python 2.3 and 2.4, also. 21 Dec 2005; Chris Gianelloni README, targets/support/livecdfs-update.sh: diff --git a/modules/stage1_target.py b/modules/stage1_target.py index cb1c9044..000cf1fc 100644 --- a/modules/stage1_target.py +++ b/modules/stage1_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/stage1_target.py,v 1.20 2005/12/20 20:53:49 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage1_target.py,v 1.21 2005/12/21 17:18:28 wolf31o2 Exp $ """ Builder class for a stage1 installation tarball build. @@ -26,7 +26,14 @@ class stage1_target(generic_stage_target): self.settings["destpath"]=normpath(self.settings["chroot_path"]+self.settings["root_path"]) def set_cleanables(self): generic_stage_target.set_cleanables(self) - self.settings["cleanables"].extend(["/usr/share/gettext","/usr/lib/python2.2/test", "/usr/lib/python2.2/encodings","/usr/lib/python2.2/email", "/usr/lib/python2.2/lib-tk","/usr/share/zoneinfo"]) + self.settings["cleanables"].extend(["/usr/share/gettext",\ + "/usr/lib/python2.2/test", "/usr/lib/python2.2/encodings",\ + "/usr/lib/python2.2/email", "/usr/lib/python2.2/lib-tk",\ + "/usr/lib/python2.3/test", "/usr/lib/python2.3/encodings",\ + "/usr/lib/python2.3/email", "/usr/lib/python2.3/lib-tk",\ + "/usr/lib/python2.4/test", "/usr/lib/python2.4/encodings",\ + "/usr/lib/python2.4/email", "/usr/lib/python2.4/lib-tk",\ + "/usr/share/zoneinfo"]) def override_chost(self): #if os.environ.has_key("CHOST"): -- 2.26.2