diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-16 00:19:13 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-16 00:19:13 +0000 |
| commit | 22ef9fa49f63d28cf239b14ec7138fe94299a012 (patch) | |
| tree | 17a252ce49d35883c8bc2fbcfe3a17b0dae217ba | |
| parent | d5c544a4f46b94d7e529cd15ad6c6884fd87007f (diff) | |
| download | portage-22ef9fa49f63d28cf239b14ec7138fe94299a012.tar.gz portage-22ef9fa49f63d28cf239b14ec7138fe94299a012.tar.bz2 portage-22ef9fa49f63d28cf239b14ec7138fe94299a012.zip | |
Handle potential InvalidDependString exceptions from visible().
svn path=/main/trunk/; revision=9912
| -rw-r--r-- | pym/_emerge/__init__.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index ab1bb3543..f7155faff 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2728,7 +2728,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 @@ -4435,9 +4438,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): |