diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-10-06 17:43:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-10-06 17:43:56 +0000 |
| commit | 7d4d7d745f32b35a75586e883bba0a2ed345e72b (patch) | |
| tree | 6b69ab2bfe884949a8663397104fe1775260f0cf | |
| parent | 7362b8ee7f1e55881f850d0dfcf425817872c586 (diff) | |
| download | portage-7d4d7d745f32b35a75586e883bba0a2ed345e72b.tar.gz portage-7d4d7d745f32b35a75586e883bba0a2ed345e72b.tar.bz2 portage-7d4d7d745f32b35a75586e883bba0a2ed345e72b.zip | |
Bug #239471 - Handle InvalidDependString from portdbapi.getfetchlist() inside
search.output(). (trunk r11602)
svn path=/main/branches/2.1.4/; revision=11641
| -rwxr-xr-x | bin/emerge | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/bin/emerge b/bin/emerge index f71536f34..61bec137d 100755 --- a/bin/emerge +++ b/bin/emerge @@ -634,13 +634,19 @@ class search: import portage_manifest as manifest mf = manifest.Manifest( pkgdir, self.settings["DISTDIR"]) - fetchlist = self.portdb.getfetchlist(mycpv, - mysettings=self.settings, all=True)[1] try: - mysum[0] = mf.getDistfilesSize(fetchlist) - except KeyError, e: - file_size_str = "Unknown (missing digest for %s)" % \ - str(e) + fetchlist = self.portdb.getfetchlist(mycpv, + mysettings=self.settings, all=True)[1] + except portage_exception.InvalidDependString, e: + file_size_str = "Unknown (%s)" % (e,) + del e + else: + try: + mysum[0] = mf.getDistfilesSize(fetchlist) + except KeyError, e: + file_size_str = "Unknown (missing " + \ + "digest for %s)" % (e,) + del e available = False for db in self._dbs: |