Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/
Date: Sat, 22 Feb 2014 18:43:35
Message-Id: 1393093901.8f9a2140ebb394fe4210ac6273e0916cf96438fd.dol-sen@gentoo
1 commit: 8f9a2140ebb394fe4210ac6273e0916cf96438fd
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 Feb 22 18:31:41 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8f9a2140
7
8 generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror
9
10 ---
11 catalyst/targets/generic_stage_target.py | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14 diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py
15 index 095327a..7fd583e 100644
16 --- a/catalyst/targets/generic_stage_target.py
17 +++ b/catalyst/targets/generic_stage_target.py
18 @@ -470,10 +470,10 @@ class generic_stage_target(generic_target):
19 hash_function=self.settings["hash_function"],verbose=False)
20
21 def set_snapcache_path(self):
22 + self.settings["snapshot_cache_path"] = \
23 + normpath(self.settings["snapshot_cache"] + "/" +
24 + self.settings["snapshot"])
25 if "SNAPCACHE" in self.settings:
26 - self.settings["snapshot_cache_path"] = \
27 - normpath(self.settings["snapshot_cache"] + "/" +
28 - self.settings["snapshot"])
29 self.snapcache_lock=\
30 LockDir(self.settings["snapshot_cache_path"])
31 print "Caching snapshot to "+self.settings["snapshot_cache_path"]