On Sat, Mar 22, 2014 at 03:39:34PM -0700, Brian Dolbec wrote:
> On Sat, 8 Mar 2014 10:25:09 -0800 "W. Trevor King" wrote:
> > 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...
Ah, good point ;).
> 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"],
> + ]))
This looks good to me.
Cheers,
Trevor
--
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy
signature.asc
Description: OpenPGP digital signature
