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 86F491393E9 for ; Wed, 2 Apr 2014 20:09:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84DDAE0DFF; Wed, 2 Apr 2014 20:09:26 +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 E1AE2E0DC8 for ; Wed, 2 Apr 2014 20:09:25 +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 0DC9B33FDEA for ; Wed, 2 Apr 2014 20:09:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1996E188F3 for ; Wed, 2 Apr 2014 20:09:23 +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: <1396469062.e2cf676cffe44e4048113a48a4362b57867d11b6.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:master 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: e2cf676cffe44e4048113a48a4362b57867d11b6 X-VCS-Branch: master Date: Wed, 2 Apr 2014 20:09:23 +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: 8e78f84d-833d-4538-8d21-831b849d1707 X-Archives-Hash: 15bb676ba63e786caab9376c86b2d078 Message-ID: <20140402200923.e8u5Eb2iTGFOeoO8nsYnr9nAbNpaMbTt2CaqMdSh4LE@z> commit: e2cf676cffe44e4048113a48a4362b57867d11b6 Author: Brian Dolbec gentoo org> AuthorDate: Sat Jan 11 00:13:06 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Apr 2 20:04:22 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e2cf676c generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror --- catalyst/targets/generic_stage_target.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py index 9c39d00..eaf2c1f 100644 --- a/catalyst/targets/generic_stage_target.py +++ b/catalyst/targets/generic_stage_target.py @@ -215,13 +215,14 @@ class generic_stage_target(generic_target): self.mountmap = SOURCE_MOUNTS_DEFAULTS.copy() # update them from settings self.mountmap["distdir"] = self.settings["distdir"] - self.mountmap["portdir"] = normpath("/".join([ - self.settings["snapshot_cache_path"], - self.settings["repo_name"], - ])) if "SNAPCACHE" not in self.settings: self.mounts.remove("portdir") - #self.mountmap["portdir"] = None + self.mountmap["portdir"] = None + else: + self.mountmap["portdir"] = normpath("/".join([ + self.settings["snapshot_cache_path"], + self.settings["repo_name"], + ])) if os.uname()[0] == "Linux": self.mounts.append("devpts") self.mounts.append("shm")