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 0FAF0138F48 for ; Sat, 22 Feb 2014 21:48:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 801C7E0BD7; Sat, 22 Feb 2014 21:48:41 +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 D0C47E0BD8 for ; Sat, 22 Feb 2014 21:48:40 +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 ED15333FA4F for ; Sat, 22 Feb 2014 21:48:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B89BD188EB for ; Sat, 22 Feb 2014 21:48:38 +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: <1393105398.eea6c80dec49e4fa7b0df6170dcb1b455f1ac837.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/generic_stage_target.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: eea6c80dec49e4fa7b0df6170dcb1b455f1ac837 X-VCS-Branch: pending Date: Sat, 22 Feb 2014 21:48:38 +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: e128e63d-8377-439e-b4f3-2a3320d6f0dc X-Archives-Hash: d43c1698cfa38643fa182ebb99af3ca3 commit: eea6c80dec49e4fa7b0df6170dcb1b455f1ac837 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jan 11 00:13:06 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Feb 22 21:43:18 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=eea6c80d generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror --- catalyst/targets/generic_stage_target.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py index 095327a..7fd583e 100644 --- a/catalyst/targets/generic_stage_target.py +++ b/catalyst/targets/generic_stage_target.py @@ -470,10 +470,10 @@ class generic_stage_target(generic_target): hash_function=self.settings["hash_function"],verbose=False) def set_snapcache_path(self): + self.settings["snapshot_cache_path"] = \ + normpath(self.settings["snapshot_cache"] + "/" + + self.settings["snapshot"]) if "SNAPCACHE" in self.settings: - self.settings["snapshot_cache_path"] = \ - normpath(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"]