diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-10-17 22:57:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-10-17 22:57:09 -0700 |
| commit | 25bf5ebc00fa1c79e6f764a58802cd70a16967bf (patch) | |
| tree | 99a5a13f2f6c62f2170455da669944780ff4912f /pym/portage | |
| parent | d159be545ecb431addc3e7bb31a8ed8cfd9984af (diff) | |
| download | portage-25bf5ebc00fa1c79e6f764a58802cd70a16967bf.tar.gz portage-25bf5ebc00fa1c79e6f764a58802cd70a16967bf.tar.bz2 portage-25bf5ebc00fa1c79e6f764a58802cd70a16967bf.zip | |
Handle InvalidData from _pkg_str.
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/_sets/libs.py | 3 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/_sets/libs.py b/pym/portage/_sets/libs.py index 27ef50e71..a6433e855 100644 --- a/pym/portage/_sets/libs.py +++ b/pym/portage/_sets/libs.py @@ -3,6 +3,7 @@ from __future__ import print_function +from portage.exception import InvalidData from portage.localization import _ from portage._sets.base import PackageSet from portage._sets import get_boolean, SetConfigError @@ -22,7 +23,7 @@ class LibraryConsumerSet(PackageSet): for cpv in self.dbapi._linkmap.getOwners(p): try: pkg = self.dbapi._pkg_str(cpv, None) - except KeyError: + except (KeyError, InvalidData): # This is expected for preserved libraries # of packages that have been uninstalled # without replacement. diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 30b6cb17d..46afea572 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -4094,7 +4094,7 @@ class dblink(object): try: slot = self.vartree.dbapi._pkg_str(cpv, None).slot counter = self.vartree.dbapi.cpv_counter(cpv) - except KeyError: + except (KeyError, InvalidData): pass else: has_vdb_entry = True |