Tinderbox no longer cleans /tmp/*

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

diff --git a/ChangeLog b/ChangeLog
index 37dc5b251cf7dc504b69a72eb1acdec03b6be66f..7476e28b2190a37d8039a90582aa8a737b1a19d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.342 2005/10/06 20:56:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.343 2005/10/06 21:00:03 rocket Exp $
+
+  06 Oct 2005; Eric Edgar <rocket@gentoo.org> modules/tinderbox_target.py:
+  Tinderbox no longer cleans /tmp/*
 
   06 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/tinderbox/tinderbox-chroot.sh,

diff --git a/modules/tinderbox_target.py b/modules/tinderbox_target.py
index cc5a25d075f9ba1c8f17bcf67112eda6eaf8817f..5975d23f48776d503d98d8d38043025e4f913874 100644 (file)
--- a/modules/tinderbox_target.py
+++ b/modules/tinderbox_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/tinderbox_target.py,v 1.11 2005/10/06 20:55:42 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/tinderbox_target.py,v 1.12 2005/10/06 21:00:03 rocket Exp $
 
 """
 builder class for the tinderbox target
@@ -26,7 +26,9 @@ class tinderbox_target(generic_stage_target):
                except CatalystError:
                        self.unbind()
                        raise CatalystError,"Tinderbox aborting due to error."
-       
+       def set_cleanables(self):
+           self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*",\
+                                       "/usr/portage"]
        def set_action_sequence(self):
                 #Default action sequence for run method
                 self.settings["action_sequence"]=["unpack","unpack_snapshot",\