From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9322C138A1F for ; Fri, 18 Apr 2014 16:52:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5413EE0AC5; Fri, 18 Apr 2014 16:52:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C497E0AC3 for ; Fri, 18 Apr 2014 16:52:27 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C175C340394 for ; Fri, 18 Apr 2014 16:52:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9D60C1825D for ; Fri, 18 Apr 2014 16:52:24 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1397839836.9da08e01a9a2fc5ae693b19f64bcd7f0aab6bde4.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 9da08e01a9a2fc5ae693b19f64bcd7f0aab6bde4 X-VCS-Branch: 3.0 Date: Fri, 18 Apr 2014 16:52:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f4465424-aff8-43db-bb47-e48097cbbaac X-Archives-Hash: 1c955830f084c5a3fcdd0fc9c70afd28 commit: 9da08e01a9a2fc5ae693b19f64bcd7f0aab6bde4 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jan 11 00:13:06 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Apr 18 16:50:36 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9da08e01 generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror --- catalyst/base/stagebase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 90dd37d..744ce08 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -458,10 +458,10 @@ class StageBase(TargetBase, ClearBase, GenBase): verbose=False) def set_snapcache_path(self): + self.settings["snapshot_cache_path"] = \ + normpath(pjoin(self.settings["snapshot_cache"], + self.settings["snapshot"])) if "snapcache" in self.settings["options"]: - self.settings["snapshot_cache_path"]=\ - normpath(pjoin(self.settings["snapshot_cache"], - self.settings["snapshot"])) self.snapcache_lock=\ LockDir(self.settings["snapshot_cache_path"]) print "Caching snapshot to "+self.settings["snapshot_cache_path"]