1 |
commit: 8eabfb7bef8e2b4ffd805a7cb5914c8ea33b8254 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 4 01:04:10 2014 +0000 |
4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Mar 22 18:01:31 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8eabfb7b |
7 |
|
8 |
Move generic_stage_targets.py constants to defaults.py |
9 |
|
10 |
Rename the source and target mounts defaults to remove |
11 |
the double plural. |
12 |
|
13 |
--- |
14 |
catalyst/defaults.py | 27 +++++++++++++++++++++++++ |
15 |
catalyst/targets/generic_stage_target.py | 34 ++++---------------------------- |
16 |
2 files changed, 31 insertions(+), 30 deletions(-) |
17 |
|
18 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
19 |
index b1dbda4..748d1dd 100644 |
20 |
--- a/catalyst/defaults.py |
21 |
+++ b/catalyst/defaults.py |
22 |
@@ -21,3 +21,30 @@ valid_config_file_values.extend(["PKGCACHE", "KERNCACHE", "CCACHE", "DISTCC", |
23 |
|
24 |
verbosity = 1 |
25 |
|
26 |
+PORT_LOGDIR_CLEAN = \ |
27 |
+ 'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' |
28 |
+ |
29 |
+TARGET_MOUNT_DEFAULTS = { |
30 |
+ "ccache": "/var/tmp/ccache", |
31 |
+ "dev": "/dev", |
32 |
+ "devpts": "/dev/pts", |
33 |
+ "distdir": "/usr/portage/distfiles", |
34 |
+ "icecream": "/usr/lib/icecc/bin", |
35 |
+ "kerncache": "/tmp/kerncache", |
36 |
+ "packagedir": "/usr/portage/packages", |
37 |
+ "portdir": "/usr/portage", |
38 |
+ "port_tmpdir": "/var/tmp/portage", |
39 |
+ "port_logdir": "/var/log/portage", |
40 |
+ "proc": "/proc", |
41 |
+ "shm": "/dev/shm", |
42 |
+ } |
43 |
+ |
44 |
+SOURCE_MOUNT_DEFAULTS = { |
45 |
+ "dev": "/dev", |
46 |
+ "devpts": "/dev/pts", |
47 |
+ "distdir": "/usr/portage/distfiles", |
48 |
+ "portdir": "/usr/portage", |
49 |
+ "port_tmpdir": "tmpfs", |
50 |
+ "proc": "/proc", |
51 |
+ "shm": "shmfs", |
52 |
+ } |
53 |
|
54 |
diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py |
55 |
index de4842c..05c61e8 100644 |
56 |
--- a/catalyst/targets/generic_stage_target.py |
57 |
+++ b/catalyst/targets/generic_stage_target.py |
58 |
@@ -4,34 +4,8 @@ from generic_target import * |
59 |
from stat import * |
60 |
from catalyst.lock import LockDir |
61 |
|
62 |
- |
63 |
-PORT_LOGDIR_CLEAN = \ |
64 |
- 'find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete' |
65 |
- |
66 |
-TARGET_MOUNTS_DEFAULTS = { |
67 |
- "ccache": "/var/tmp/ccache", |
68 |
- "dev": "/dev", |
69 |
- "devpts": "/dev/pts", |
70 |
- "distdir": "/usr/portage/distfiles", |
71 |
- "icecream": "/usr/lib/icecc/bin", |
72 |
- "kerncache": "/tmp/kerncache", |
73 |
- "packagedir": "/usr/portage/packages", |
74 |
- "portdir": "/usr/portage", |
75 |
- "port_tmpdir": "/var/tmp/portage", |
76 |
- "port_logdir": "/var/log/portage", |
77 |
- "proc": "/proc", |
78 |
- "shm": "/dev/shm", |
79 |
- } |
80 |
- |
81 |
-SOURCE_MOUNTS_DEFAULTS = { |
82 |
- "dev": "/dev", |
83 |
- "devpts": "/dev/pts", |
84 |
- "distdir": "/usr/portage/distfiles", |
85 |
- "portdir": "/usr/portage", |
86 |
- "port_tmpdir": "tmpfs", |
87 |
- "proc": "/proc", |
88 |
- "shm": "shmfs", |
89 |
- } |
90 |
+from catalyst.defaults import (SOURCE_MOUNT_DEFAULTS, TARGET_MOUNT_DEFAULTS, |
91 |
+ PORT_LOGDIR_CLEAN) |
92 |
|
93 |
# for convienience |
94 |
pjoin = os.path.join |
95 |
@@ -208,11 +182,11 @@ class generic_stage_target(generic_target): |
96 |
|
97 |
""" Setup our mount points """ |
98 |
# initialize our target mounts. |
99 |
- self.target_mounts = TARGET_MOUNTS_DEFAULTS.copy() |
100 |
+ self.target_mounts = TARGET_MOUNT_DEFAULTS.copy() |
101 |
|
102 |
self.mounts = ["proc", "dev", "portdir", "distdir", "port_tmpdir"] |
103 |
# initialize our source mounts |
104 |
- self.mountmap = SOURCE_MOUNTS_DEFAULTS.copy() |
105 |
+ self.mountmap = SOURCE_MOUNT_DEFAULTS.copy() |
106 |
# update them from settings |
107 |
self.mountmap["distdir"] = self.settings["distdir"] |
108 |
if "SNAPCACHE" not in self.settings: |