From 33b197b02574c0f49d4dce659562d2f3362e5eba Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 20 Jun 2011 18:31:17 -0700 Subject: [PATCH] UseManager: avoid possible repo KeyErrors --- pym/portage/package/ebuild/_config/UseManager.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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: -- 2.26.2