Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/base/
Date: Wed, 22 Jan 2014 05:04:29
Message-Id: 1390365385.c88d930a286a836ffe137a46d13d15c70ccb6b67.dol-sen@gentoo
1 commit: c88d930a286a836ffe137a46d13d15c70ccb6b67
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: Wed Jan 22 04:36:25 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c88d930a
7
8 generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror
9
10 ---
11 catalyst/base/stagebase.py | 6 +++---
12 1 file changed, 3 insertions(+), 3 deletions(-)
13
14 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
15 index f7397e7..d1109c5 100644
16 --- a/catalyst/base/stagebase.py
17 +++ b/catalyst/base/stagebase.py
18 @@ -458,10 +458,10 @@ class StageBase(TargetBase, ClearBase, GenBase):
19 verbose=False)
20
21 def set_snapcache_path(self):
22 + self.settings["snapshot_cache_path"] = \
23 + normpath(pjoin(self.settings["snapshot_cache"],
24 + self.settings["snapshot"]))
25 if "snapcache" in self.settings["options"]:
26 - self.settings["snapshot_cache_path"]=\
27 - normpath(pjoin(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"]