From 77234e6617b2bcf4be8050f30e26db6067bf0013 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 16 Apr 2008 00:19:56 +0000 Subject: Handle potential InvalidDependString exceptions from visible(). (trunk r9912) svn path=/main/branches/2.1.2/; revision=9913 --- bin/emerge | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index f665bfcef..70dbd4ddd 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2875,7 +2875,10 @@ class depgraph(object): # here, packages that have been masked since they # were installed can be automatically downgraded # to an unmasked version. - if not visible(pkgsettings, pkg): + try: + if not visible(pkgsettings, pkg): + continue + except portage_exception.InvalidDependString: continue if not built and not calculated_use: # This is avoided whenever possible because @@ -4589,9 +4592,13 @@ class depgraph(object): arg = None if arg: return False - if pkg.installed and \ - not visible(self._depgraph.pkgsettings[pkg.root], pkg): - return False + if pkg.installed: + try: + if not visible( + self._depgraph.pkgsettings[pkg.root], pkg): + return False + except portage_exception.InvalidDependString: + pass return True def _dep_expand(self, atom): -- cgit v1.2.3-1-g7c22