modules/tinderbox_target.py: Use 'portdir' instead of hard-coding '/usr/portage'

W. Trevor King: Refactored Git history for Brian Dolbec's content
changes with additional whitespace cleanups.

Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>

diff --git a/modules/tinderbox_target.py b/modules/tinderbox_target.py
index 46fe08299d44c41b749eba990256501da0840b4e..ca556108ed1d252d751c97136f2e31bc834856fb 100644 (file)
--- a/modules/tinderbox_target.py
+++ b/modules/tinderbox_target.py
@@ -29,8 +29,12 @@ class tinderbox_target(generic_stage_target):
                        raise CatalystError,"Tinderbox aborting due to error."
 
        def set_cleanables(self):
-           self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/root/*",\
-                                       "/usr/portage"]
+               self.settings['cleanables'] = [
+                       '/etc/resolv.conf',
+                       '/var/tmp/*',
+                       '/root/*',
+                       self.settings['portdir'],
+                       ]
 
        def set_action_sequence(self):
                #Default action sequence for run method