[gentoo-catalyst] Re: [PATCH 2/5] generic_stage_target.py: Fix an intermittent snapshot_cache_path keyerror

["W. Trevor King" <wking@tremily.us>]

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

On Sun, Mar 02, 2014 at 03:00:59PM -0800, Brian Dolbec wrote:
>  	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"])

If we're getting snapshot_cache_path key errors, I think the solution
is to protect those call sites with:

  if 'SNAPCACHE' in self.settings:

blocks, not to define a snapcache-only setting for folks who are not
using snapcaches.  There are not particularly many snapshot_cache_path
references in catalyst.  Grepping through them, the following looks
suspicious:

catalyst/targets/generic_stage_target.py-215-           self.mountmap["portdir"] = normpath("/".join([
catalyst/targets/generic_stage_target.py:216:                   self.settings["snapshot_cache_path"],
catalyst/targets/generic_stage_target.py-217-                   self.settings["repo_name"],
catalyst/targets/generic_stage_target.py-218-                   ]))
catalyst/targets/generic_stage_target.py-219-           if "SNAPCACHE" not in self.settings:

Everything else looks fine.  So what should portdir be if SNAPCACHE
isn't set?

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]