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

diff --git a/ChangeLog b/ChangeLog
index c340108061196055b19016c2df7b2217668aee3f..69de38a7a091cb573a760b31471f997a3c05e173 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,17 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/stage1_target.py:
+  Removing cleaning of python encodings for bug #64890.
+
   11 Nov 2007; Andrew Gaffney <agaffney@gentoo.org>
   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 <agaffney@gentoo.org>
   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 <agaffney@gentoo.org>
   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 <agaffney@gentoo.org> 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 <agaffney@gentoo.org>
   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 <wolf31o2@gentoo.org> catalyst,
   examples/livecd-stage2_template.spec, modules/generic_stage_target.py:

diff --git a/modules/stage1_target.py b/modules/stage1_target.py
index 04233d91919e7b928168bef2d6042120c7519cd6..614d0dbfb62323def8e3803645383a383271ff7d 100644 (file)
--- 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?