From 6963317502e8aad07a8bbc0f560f21cf4a2ef77f Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Mon, 6 Apr 2009 21:09:33 -0500 Subject: [PATCH] Clean up cleanables --- ChangeLog | 4 ++++ modules/catalyst/target/stage1.py | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f7ee65c..38815e45 100644 --- 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 + modules/catalyst/target/stage1.py: + Clean up cleanables + 05 Apr 2009; Andrew Gaffney 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 82403920..3004649a 100644 --- 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? -- 2.26.2