1 |
Author: zmedico |
2 |
Date: 2008-10-06 17:43:56 +0000 (Mon, 06 Oct 2008) |
3 |
New Revision: 11641 |
4 |
|
5 |
Modified: |
6 |
main/branches/2.1.4/bin/emerge |
7 |
Log: |
8 |
Bug #239471 - Handle InvalidDependString from portdbapi.getfetchlist() inside |
9 |
search.output(). (trunk r11602) |
10 |
|
11 |
|
12 |
Modified: main/branches/2.1.4/bin/emerge |
13 |
=================================================================== |
14 |
--- main/branches/2.1.4/bin/emerge 2008-10-06 17:18:18 UTC (rev 11640) |
15 |
+++ main/branches/2.1.4/bin/emerge 2008-10-06 17:43:56 UTC (rev 11641) |
16 |
@@ -634,13 +634,19 @@ |
17 |
import portage_manifest as manifest |
18 |
mf = manifest.Manifest( |
19 |
pkgdir, self.settings["DISTDIR"]) |
20 |
- fetchlist = self.portdb.getfetchlist(mycpv, |
21 |
- mysettings=self.settings, all=True)[1] |
22 |
try: |
23 |
- mysum[0] = mf.getDistfilesSize(fetchlist) |
24 |
- except KeyError, e: |
25 |
- file_size_str = "Unknown (missing digest for %s)" % \ |
26 |
- str(e) |
27 |
+ fetchlist = self.portdb.getfetchlist(mycpv, |
28 |
+ mysettings=self.settings, all=True)[1] |
29 |
+ except portage_exception.InvalidDependString, e: |
30 |
+ file_size_str = "Unknown (%s)" % (e,) |
31 |
+ del e |
32 |
+ else: |
33 |
+ try: |
34 |
+ mysum[0] = mf.getDistfilesSize(fetchlist) |
35 |
+ except KeyError, e: |
36 |
+ file_size_str = "Unknown (missing " + \ |
37 |
+ "digest for %s)" % (e,) |
38 |
+ del e |
39 |
|
40 |
available = False |
41 |
for db in self._dbs: |