From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 21 Jun 2011 01:31:17 +0000 (-0700)
Subject: UseManager: avoid possible repo KeyErrors
X-Git-Tag: v2.2.0_alpha42~39
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=33b197b02574c0f49d4dce659562d2f3362e5eba;p=portage.git

UseManager: avoid possible repo KeyErrors
---

diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py
index de18500a9..67e92944e 100644
--- a/pym/portage/package/ebuild/_config/UseManager.py
+++ b/pym/portage/package/ebuild/_config/UseManager.py
@@ -148,8 +148,8 @@ class UseManager(object):
 		usemask = []
 		if hasattr(pkg, "repo") and pkg.repo != Package.UNKNOWN_REPO:
 			for repo in [repo.name for repo in self.repositories[pkg.repo].masters] + [pkg.repo]:
-				usemask.append(self._repo_usemask_dict[repo])
-				cpdict = self._repo_pusemask_dict[repo].get(cp)
+				usemask.append(self._repo_usemask_dict.get(repo, {}))
+				cpdict = self._repo_pusemask_dict.get(repo, {}).get(cp)
 				if cpdict:
 					pkg_usemask = ordered_by_atom_specificity(cpdict, pkg)
 					if pkg_usemask:
@@ -175,8 +175,8 @@ class UseManager(object):
 		useforce = []
 		if hasattr(pkg, "repo") and pkg.repo != Package.UNKNOWN_REPO:
 			for repo in [repo.name for repo in self.repositories[pkg.repo].masters] + [pkg.repo]:
-				useforce.append(self._repo_useforce_dict[repo])
-				cpdict = self._repo_puseforce_dict[repo].get(cp)
+				useforce.append(self._repo_useforce_dict.get(repo, {}))
+				cpdict = self._repo_puseforce_dict.get(repo, {}).get(cp)
 				if cpdict:
 					pkg_useforce = ordered_by_atom_specificity(cpdict, pkg)
 					if pkg_useforce: