summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-06-11 09:36:18 +0000
committerZac Medico <zmedico@gentoo.org>2008-06-11 09:36:18 +0000
commiteee8439f8a16f22457ab648a628944b06d4ea7dc (patch)
treee298e02b56cb350f5fbe3c252d7ffb4e3c2d77f5
parentBug #225767 - Suppress warnings for installed packages masked by keywords (diff)
downloadportage-multirepo-eee8439f8a16f22457ab648a628944b06d4ea7dc.tar.gz
portage-multirepo-eee8439f8a16f22457ab648a628944b06d4ea7dc.tar.bz2
portage-multirepo-eee8439f8a16f22457ab648a628944b06d4ea7dc.zip
Handle InvalidDependString in _package_cache.__setitem__(). (trunk r10648)v2.1.5.5
svn path=/main/branches/2.1.2/; revision=10649
-rwxr-xr-xbin/emerge11
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge
index b7a3c153..db698590 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -5747,10 +5747,13 @@ class depgraph(object):
def __setitem__(self, k, v):
dict.__setitem__(self, k, v)
root_config = self._depgraph.roots[v.root]
- if visible(root_config.settings, v) and \
- not (v.installed and \
- v.root_config.settings._getMissingKeywords(v.cpv, v.metadata)):
- root_config.visible_pkgs.cpv_inject(v)
+ try:
+ if visible(root_config.settings, v) and \
+ not (v.installed and \
+ v.root_config.settings._getMissingKeywords(v.cpv, v.metadata)):
+ root_config.visible_pkgs.cpv_inject(v)
+ except portage_exception.InvalidDependString:
+ pass
class RepoDisplay(object):
def __init__(self, roots):