| 1 |
commit: 59f782fb182510a86bbb5b120083b93b90cf7a80 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 29 09:03:14 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Wed Jan 22 04:30:23 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=59f782fb |
| 7 |
|
| 8 |
Fix mounts and mountmap port_logdir code block. |
| 9 |
|
| 10 |
Conflicts: |
| 11 |
catalyst/base/stagebase.py |
| 12 |
|
| 13 |
--- |
| 14 |
catalyst/base/stagebase.py | 9 +++++---- |
| 15 |
catalyst/defaults.py | 3 +++ |
| 16 |
2 files changed, 8 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 19 |
index 10868ee..3021620 100644 |
| 20 |
--- a/catalyst/base/stagebase.py |
| 21 |
+++ b/catalyst/base/stagebase.py |
| 22 |
@@ -13,7 +13,8 @@ from catalyst.support import (CatalystError, msg, file_locate, normpath, |
| 23 |
from catalyst.base.targetbase import TargetBase |
| 24 |
from catalyst.base.clearbase import ClearBase |
| 25 |
from catalyst.base.genbase import GenBase |
| 26 |
-from catalyst.defaults import TARGET_MOUNT_DEFAULTS, SOURCE_MOUNT_DEFAULTS |
| 27 |
+from catalyst.defaults import (TARGET_MOUNT_DEFAULTS, SOURCE_MOUNT_DEFAULTS, |
| 28 |
+ PORT_LOGDIR_CLEAN) |
| 29 |
from catalyst.lock import LockDir |
| 30 |
from catalyst.fileops import ensure_dirs, pjoin |
| 31 |
from catalyst.base.resume import AutoResume |
| 32 |
@@ -253,9 +254,9 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 33 |
|
| 34 |
if "port_logdir" in self.settings: |
| 35 |
self.mounts.append("port_logdir") |
| 36 |
- self.mountmap["port_logdir"]=self.settings["port_logdir"] |
| 37 |
- self.env["PORT_LOGDIR"]=self.settings["port_logdir"] |
| 38 |
- self.env["PORT_LOGDIR_CLEAN"]='find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' |
| 39 |
+ self.mountmap["port_logdir"] = self.settings["port_logdir"] |
| 40 |
+ self.env["PORT_LOGDIR"] = self.settings["port_logdir"] |
| 41 |
+ self.env["PORT_LOGDIR_CLEAN"] = PORT_LOGDIR_CLEAN |
| 42 |
|
| 43 |
def override_cbuild(self): |
| 44 |
if "CBUILD" in self.makeconf: |
| 45 |
|
| 46 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 47 |
index 1f86c1d..59941ee 100644 |
| 48 |
--- a/catalyst/defaults.py |
| 49 |
+++ b/catalyst/defaults.py |
| 50 |
@@ -105,6 +105,9 @@ SOURCE_MOUNT_DEFAULTS = { |
| 51 |
"shm": "shmfs", |
| 52 |
} |
| 53 |
|
| 54 |
+PORT_LOGDIR_CLEAN = \ |
| 55 |
+ 'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' |
| 56 |
+ |
| 57 |
# legend: key: message |
| 58 |
option_messages = { |
| 59 |
"autoresume": "Autoresuming support enabled.", |
Archives