[gentoo-catalyst] Catalyst tree move code changes. [3 of 4]

[gentoo-catalyst] Catalyst tree move code changes. [3 of 4]

[Brian Dolbec]

[-- Attachment #1.1: Type: text/plain, Size: 180 bytes --]

use the portdir setting rather than hard-coded path.
-- 
Brian Dolbec <brian.dolbec@gmail.com>

-- 
Brian Dolbec <dolsen@gentoo.org>

-- 
Brian Dolbec <dolsen@gentoo.org>

[-- Attachment #1.2: 0003-use-the-portdir-setting.patch --]
[-- Type: text/x-patch, Size: 959 bytes --]

From 773edaaf1db072c5b15b3680413d1fb9e5841593 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Wed, 19 Dec 2012 18:10:15 -0800
Subject: [PATCH] use the portdir setting rather than hard-coded path

---
 modules/tinderbox_target.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tinderbox_target.py b/modules/tinderbox_target.py
index 46fe082..d6d3ea3 100644
--- a/modules/tinderbox_target.py
+++ b/modules/tinderbox_target.py
@@ -29,8 +29,8 @@ 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
-- 
1.8.0


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [gentoo-catalyst] Catalyst tree move code changes. [3 of 4]

[Brian Dolbec]

[-- Attachment #1: Type: text/plain, Size: 1860 bytes --]

On Mon, 2013-01-07 at 18:53 -0800, Brian Dolbec wrote:
> use the portdir setting rather than hard-coded path.
> -- 
> Brian Dolbec <brian.dolbec@gmail.com>
> 
> -- 
> Brian Dolbec <dolsen@gentoo.org>


Now that #3 has fianly made it to the list...

What about some of the other paths in cleanables?  Perhaps they too
should be config'd and then use the the config value, rather than be
hard-coded here.  But not being involved in using catalyst, that is
something I don't know.

I see 'resolv.conf' and '/var/tmp/*' that probably should be config'd,
what about 'root/*'

By doing that.  It would put all control back to the config, making it
one place to edit for a simple path change.  Easing maintenance for the
future.


> 
From 773edaaf1db072c5b15b3680413d1fb9e5841593 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <dolsen@gentoo.org>
Date: Wed, 19 Dec 2012 18:10:15 -0800
Subject: [PATCH] use the portdir setting rather than hard-coded path

---
 modules/tinderbox_target.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/tinderbox_target.py b/modules/tinderbox_target.py
index 46fe082..d6d3ea3 100644
--- a/modules/tinderbox_target.py
+++ b/modules/tinderbox_target.py
@@ -29,8 +29,8 @@ 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
-- 
1.8.0


-- 
Brian Dolbec <dolsen@gentoo.org>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]