| 1 |
commit: 509d4ead51fbb861cfa783131b22907c8b8636db |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 11 00:13:06 2014 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Sat Mar 22 18:01:29 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=509d4ead |
| 7 |
|
| 8 |
generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror |
| 9 |
|
| 10 |
--- |
| 11 |
catalyst/targets/generic_stage_target.py | 11 ++++++----- |
| 12 |
1 file changed, 6 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py |
| 15 |
index 9c39d00..eaf2c1f 100644 |
| 16 |
--- a/catalyst/targets/generic_stage_target.py |
| 17 |
+++ b/catalyst/targets/generic_stage_target.py |
| 18 |
@@ -215,13 +215,14 @@ class generic_stage_target(generic_target): |
| 19 |
self.mountmap = SOURCE_MOUNTS_DEFAULTS.copy() |
| 20 |
# update them from settings |
| 21 |
self.mountmap["distdir"] = self.settings["distdir"] |
| 22 |
- self.mountmap["portdir"] = normpath("/".join([ |
| 23 |
- self.settings["snapshot_cache_path"], |
| 24 |
- self.settings["repo_name"], |
| 25 |
- ])) |
| 26 |
if "SNAPCACHE" not in self.settings: |
| 27 |
self.mounts.remove("portdir") |
| 28 |
- #self.mountmap["portdir"] = None |
| 29 |
+ self.mountmap["portdir"] = None |
| 30 |
+ else: |
| 31 |
+ self.mountmap["portdir"] = normpath("/".join([ |
| 32 |
+ self.settings["snapshot_cache_path"], |
| 33 |
+ self.settings["repo_name"], |
| 34 |
+ ])) |
| 35 |
if os.uname()[0] == "Linux": |
| 36 |
self.mounts.append("devpts") |
| 37 |
self.mounts.append("shm") |
Archives