| 1 |
commit: 7bc0f420943278f3efcbb2e33c949c393ab99a09 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 27 10:34:09 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 27 10:34:09 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=7bc0f420 |
| 7 |
|
| 8 |
depgraph: handle invalid SRC_URI |
| 9 |
|
| 10 |
This is a minimal fix for bug #376577. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/_emerge/resolver/output.py | 9 +++++++-- |
| 14 |
1 files changed, 7 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py |
| 17 |
index 69a30cc..05e316a 100644 |
| 18 |
--- a/pym/_emerge/resolver/output.py |
| 19 |
+++ b/pym/_emerge/resolver/output.py |
| 20 |
@@ -26,6 +26,7 @@ from _emerge.Blocker import Blocker |
| 21 |
from _emerge.create_world_atom import create_world_atom |
| 22 |
from _emerge.resolver.output_helpers import ( _DisplayConfig, _tree_display, |
| 23 |
_PackageCounters, _create_use_string, _format_size, _calc_changelog, PkgInfo) |
| 24 |
+from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice |
| 25 |
|
| 26 |
if sys.hexversion >= 0x3000000: |
| 27 |
basestring = str |
| 28 |
@@ -312,8 +313,12 @@ class Display(object): |
| 29 |
try: |
| 30 |
myfilesdict = self.portdb.getfetchsizes(pkg.cpv, |
| 31 |
useflags=pkg_info.use, myrepo=pkg.repo) |
| 32 |
- except InvalidDependString: |
| 33 |
- # should have been masked before it was selected |
| 34 |
+ except InvalidDependString as e: |
| 35 |
+ # FIXME: validate SRC_URI earlier |
| 36 |
+ depstr, = self.portdb.aux_get(pkg.cpv, |
| 37 |
+ ["SRC_URI"], myrepo=pkg.repo) |
| 38 |
+ show_invalid_depstring_notice( |
| 39 |
+ pkg, depstr, str(e)) |
| 40 |
raise |
| 41 |
if myfilesdict is None: |
| 42 |
myfilesdict = "[empty/missing/bad digest]" |
Archives