From 74447085f59039fb0d7362b32bb2ac62182d3de2 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 13 Nov 2007 21:34:21 +0000 Subject: [PATCH] Removing cleaning of python encodings for bug #64890. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1255 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 14 +++++++++----- modules/stage1_target.py | 10 ++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index c3401080..69de38a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,17 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 13 Nov 2007; Chris Gianelloni + modules/stage1_target.py: + Removing cleaning of python encodings for bug #64890. + 11 Nov 2007; Andrew Gaffney modules/generic_stage_target.py: - add an extra warning into the generated make.conf about changing the CHOST + Add an extra warning into the generated make.conf about changing the CHOST 01 Nov 2007; Andrew Gaffney targets/support/livecdfs-update.sh: - we don't need to copy files from /usr/lib/hotplug/firmware anymore + We don't need to copy files from /usr/lib/hotplug/firmware anymore. 29 Oct 2007; Andrew Gaffney targets/embedded/embedded-preclean-chroot.sh, @@ -16,15 +20,15 @@ targets/stage2/stage2-preclean-chroot.sh, targets/stage3/stage3-preclean-chroot.sh, targets/tinderbox/tinderbox-preclean-chroot.sh: - check to see if distcc is enabled before calling cleanup_distcc() + Check to see if distcc is enabled before calling cleanup_distcc(). 17 Oct 2007; Andrew Gaffney arch/ppc.py, arch/sparc.py, arch/x86.py: - look for linux32 in /bin and /usr/bin + Look for linux32 in /bin and /usr/bin. 12 Oct 2007; Andrew Gaffney modules/generic_stage_target.py: - make error message more specific when removing immutable flag + Make error message more specific when removing immutable flag. 11 Oct 2007; Chris Gianelloni catalyst, examples/livecd-stage2_template.spec, modules/generic_stage_target.py: diff --git a/modules/stage1_target.py b/modules/stage1_target.py index 04233d91..614d0dbf 100644 --- a/modules/stage1_target.py +++ b/modules/stage1_target.py @@ -24,13 +24,11 @@ class stage1_target(generic_stage_target): 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/lib/python2.3/test", "/usr/lib/python2.3/encodings",\ + "/usr/lib/python2.2/test", "/usr/lib/python2.2/email",\ + "/usr/lib/python2.2/lib-tk", "/usr/lib/python2.3/test",\ "/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"]) + "/usr/lib/python2.4/test", "/usr/lib/python2.4/email",\ + "/usr/lib/python2.4/lib-tk", "/usr/share/zoneinfo"]) # XXX: How do these override_foo() functions differ from the ones in generic_stage_target and why aren't they in stage3_target? -- 2.26.2