From: Brian Dolbec <dolsen@gentoo.org>
Date: Tue, 8 Jan 2013 07:17:22 +0000 (-0800)
Subject: modules/tinderbox_target.py: Use 'portdir' instead of hard-coding '/usr/portage'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df33334be1da8e1605e2e28887a6f9bb4bd5cb6e;p=catalyst.git

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 46fe0829..ca556108 100644
--- 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