| 1 |
Author: zmedico |
| 2 |
Date: 2008-09-30 15:16:03 +0000 (Tue, 30 Sep 2008) |
| 3 |
New Revision: 11602 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Handle InvalidDependString from portdbapi.getFetchMap() inside |
| 9 |
search.output(). Thanks to agaffney for reporting. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-09-30 01:06:20 UTC (rev 11601) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-09-30 15:16:03 UTC (rev 11602) |
| 16 |
@@ -684,12 +684,18 @@ |
| 17 |
from portage import manifest |
| 18 |
mf = manifest.Manifest( |
| 19 |
pkgdir, self.settings["DISTDIR"]) |
| 20 |
- fetchlist = self.portdb.getFetchMap(mycpv) |
| 21 |
try: |
| 22 |
- mysum[0] = mf.getDistfilesSize(fetchlist) |
| 23 |
- except KeyError, e: |
| 24 |
- file_size_str = "Unknown (missing digest for %s)" % \ |
| 25 |
- str(e) |
| 26 |
+ uri_map = self.portdb.getFetchMap(mycpv) |
| 27 |
+ except portage.exception.InvalidDependString, e: |
| 28 |
+ file_size_str = "Unknown (%s)" % (e,) |
| 29 |
+ del e |
| 30 |
+ else: |
| 31 |
+ try: |
| 32 |
+ mysum[0] = mf.getDistfilesSize(uri_map) |
| 33 |
+ except KeyError, e: |
| 34 |
+ file_size_str = "Unknown (missing " + \ |
| 35 |
+ "digest for %s)" % (e,) |
| 36 |
+ del e |
| 37 |
|
| 38 |
available = False |
| 39 |
for db in self._dbs: |
Archives