Clean up cleanables

diff --git a/ChangeLog b/ChangeLog
index 4f7ee65cfa88d80d3d66e8ac8e4f1b548a27683e..38815e459107ea5edde83ebe85fe84f13bb8e8de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  07 Apr 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/target/stage1.py:
+  Clean up cleanables
+
   05 Apr 2009; Andrew Gaffney <agaffney@gentoo.org> TODO:
   Note in TODO where things have already been done
 

diff --git a/modules/catalyst/target/stage1.py b/modules/catalyst/target/stage1.py
index 82403920b4413278a923668453ac17436b690016..3004649a5680bbf12d4646ae6bc2edf0663a919e 100644 (file)
--- a/modules/catalyst/target/stage1.py
+++ b/modules/catalyst/target/stage1.py
@@ -27,12 +27,8 @@ 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/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/email",\
-               "/usr/lib/python2.4/lib-tk", "/usr/share/zoneinfo",\
-               "/etc/portage"])
+               "/usr/lib/python2.*/{test,email,lib-tk}",\
+               "/usr/share/zoneinfo","/etc/portage"])
 
        # XXX: How do these override_foo() functions differ from the ones in generic_stage_target and why aren't they in stage3_target?