[gentoo-commits] proj/catalyst:3.0 commit in: catalyst/, catalyst/base/

[Brian Dolbec]

commit:     9e6bcc4b78172611430db8b981b2ce1b23a59263
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 29 09:03:14 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Apr 18 16:50:36 2014 +0000
URL:        
http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9e6bcc4b

Fix mounts and mountmap port_logdir code block.

Conflicts:
        catalyst/base/stagebase.py

---
 catalyst/base/stagebase.py | 9 +++++----
 catalyst/defaults.py       | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index 2cce2f7..aa9be38 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -13,7 +13,8 @@ from catalyst.support import (CatalystError, msg, 
file_locate, normpath,
 from catalyst.base.targetbase import TargetBase
 from catalyst.base.clearbase import ClearBase
 from catalyst.base.genbase import GenBase
-from catalyst.defaults import TARGET_MOUNT_DEFAULTS, SOURCE_MOUNT_DEFAULTS
+from catalyst.defaults import (TARGET_MOUNT_DEFAULTS, SOURCE_MOUNT_DEFAULTS,
+       PORT_LOGDIR_CLEAN)
 from catalyst.lock import LockDir
 from catalyst.fileops import ensure_dirs, pjoin
 from catalyst.base.resume import AutoResume
@@ -253,9 +254,9 @@ class StageBase(TargetBase, ClearBase, GenBase):
 
                if "port_logdir" in self.settings:
                        self.mounts.append("port_logdir")
-                       
self.mountmap["port_logdir"]=self.settings["port_logdir"]
-                       self.env["PORT_LOGDIR"]=self.settings["port_logdir"]
-                       self.env["PORT_LOGDIR_CLEAN"]='find "${PORT_LOGDIR}" 
-type f ! -name "summary.log*" -mtime +30 -delete'
+                       self.mountmap["port_logdir"] = 
self.settings["port_logdir"]
+                       self.env["PORT_LOGDIR"] = self.settings["port_logdir"]
+                       self.env["PORT_LOGDIR_CLEAN"] = PORT_LOGDIR_CLEAN
 
        def override_cbuild(self):
                if "CBUILD" in self.makeconf:

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 1f86c1d..59941ee 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -105,6 +105,9 @@ SOURCE_MOUNT_DEFAULTS = {
        "shm": "shmfs",
        }
 
+PORT_LOGDIR_CLEAN = \
+       'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 
-delete'
+
 # legend:  key: message
 option_messages = {
        "autoresume": "Autoresuming support enabled.",