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 2721E1391DB for ; Sat, 22 Mar 2014 22:39:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A778AE0D0C; Sat, 22 Mar 2014 22:39:50 +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 24B3AE0D0C for ; Sat, 22 Mar 2014 22:39:50 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010600222de111ff.vc.shawcable.net [96.49.5.156]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 3491C33F8F8 for ; Sat, 22 Mar 2014 22:39:49 +0000 (UTC) Date: Sat, 22 Mar 2014 15:39:34 -0700 From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Subject: Re: [gentoo-catalyst] [PATCH] generic_stage_target: Don't set mountmap['portdir'] without SNAPCACHE Message-ID: <20140322153934.20c19756.dolsen@gentoo.org> In-Reply-To: References: <20140304212508.68861936.dolsen@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 103e7e8f-5183-421d-89b0-00802dd0de89 X-Archives-Hash: 78a61440412cbcf39acb1a165c30eb4f On Sat, 8 Mar 2014 10:25:09 -0800 "W. Trevor King" wrote: > This patch should fix it. Analysis in the commit message itself. > > Cheers, > Trevor > > catalyst/targets/generic_stage_target.py | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/catalyst/targets/generic_stage_target.py > b/catalyst/targets/generic_stage_target.py index 2b3d7ce..1412ed5 > 100644 --- a/catalyst/targets/generic_stage_target.py > +++ b/catalyst/targets/generic_stage_target.py > @@ -212,11 +212,11 @@ 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.mountmap["portdir"] = > normpath("/".join([ > + self.settings["snapshot_cache_path"], > + self.settings["repo_name"], > + ])) > self.mounts.remove("portdir") > #self.mountmap["portdir"] = None > if os.uname()[0] == "Linux": Not quite correct. Note the not in that if... It turns out it was a regression for the conversion in previous commits. They original code had the "mountmap['usr/portage'] = ..." inside if "SNAPCACHE"... Anyway, here is the final fixed and rebased patch pushed to the pending branch: diff --git a/catalyst/targets/generic_stage_target.py b/catalyst/targets/generic_stage_target.py index 9c39d00..eaf2c1f 100644 @@ -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") -- Brian Dolbec