add /etc/portage to cleanables for stage 1-3

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1261 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 6692734a9be38ed129826cdec71df8b045b27760..1d7e1291610976ccbc607d2a389a4eb0be2a4784 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  25 Nov 2007; Andrew Gaffney <agaffney@gentoo.org>
+  modules/stage1_target.py, modules/stage2_target.py,
+  modules/stage3_target.py:
+  add /etc/portage to cleanables for stage 1-3
+
   17 Nov 2007; Andrew Gaffney <agaffney@gentoo.org>
   livecd/files/livecd-local.start,
   targets/livecd-stage2/livecd-stage2-controller.sh,

diff --git a/modules/stage1_target.py b/modules/stage1_target.py
index 614d0dbfb62323def8e3803645383a383271ff7d..a6eb435201c6e1a77a1ccda7b9bf1f687568ec8c 100644 (file)
--- a/modules/stage1_target.py
+++ b/modules/stage1_target.py
@@ -28,7 +28,8 @@ class stage1_target(generic_stage_target):
                "/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"])
+               "/usr/lib/python2.4/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?
 

diff --git a/modules/stage2_target.py b/modules/stage2_target.py
index f22457d681a777fc0d7287fd61d6112e6f8e3f2c..a5135b250c95dcc0df4033903c35116950106635 100644 (file)
--- a/modules/stage2_target.py
+++ b/modules/stage2_target.py
@@ -29,6 +29,10 @@ class stage2_target(generic_stage_target):
 
        # XXX: How do these override_foo() functions differ from the ones in
        # generic_stage_target and why aren't they in stage3_target?
+
+       def set_cleanables(self):
+               generic_stage_target.set_cleanables(self)
+               self.settings["cleanables"].extend(["/etc/portage"])
        
        def override_chost(self):
                if self.settings.has_key("chost"):

diff --git a/modules/stage3_target.py b/modules/stage3_target.py
index 41d0b318fae6300402b75e70d2fb10f40c0557b6..7e087cb25813151aad8ffa51b177af7daf3a95f6 100644 (file)
--- a/modules/stage3_target.py
+++ b/modules/stage3_target.py
@@ -20,6 +20,10 @@ class stage3_target(generic_stage_target):
                        print "\tIf you break it, you buy it. Don't complain to us about it."
                        print "\tDont say we did not warn you\n"
 
+       def set_cleanables(self):
+               generic_stage_target.set_cleanables(self)
+               self.settings["cleanables"].extend(["/etc/portage"])
+
 def register(foo):
        foo.update({"stage3":stage3_target})
        return foo