summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-07 19:54:13 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-07 19:54:13 +0000
commit411d007523f9508170ec6fb4ec070a1abb689ae1 (patch)
tree1b35736accc76cd789d8f2a3bf0cd1a8fc87b071 /bin/emerge
parentFor backward compatibility with api consumers, _dep_check_strict behavior wil... (diff)
downloadportage-multirepo-411d007523f9508170ec6fb4ec070a1abb689ae1.tar.gz
portage-multirepo-411d007523f9508170ec6fb4ec070a1abb689ae1.tar.bz2
portage-multirepo-411d007523f9508170ec6fb4ec070a1abb689ae1.zip
For bug #165783, handle an InvalidDependString exception triggered by an invalid SRC_URI.
svn path=/main/trunk/; revision=5908
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge12
1 files changed, 9 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge
index 21bcbf7b..60d5d6bd 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2487,9 +2487,15 @@ class depgraph:
# size verbose
mysize=0
if x[0] == "ebuild" and x[-1]!="nomerge":
- myfilesdict = portdb.getfetchsizes(
- pkg_key, useflags=self.useFlags[myroot][pkg_key],
- debug=self.edebug)
+ try:
+ myfilesdict = portdb.getfetchsizes(pkg_key,
+ useflags=self.useFlags[myroot][pkg_key],
+ debug=self.edebug)
+ except portage.exception.InvalidDependString, e:
+ src_uri = portdb.aux_get(pkg_key, ["SRC_URI"])[0]
+ show_invalid_depstring_notice(x, src_uri, str(e))
+ del e
+ sys.exit(1)
if myfilesdict is None:
myfilesdict="[empty/missing/bad digest]"
else: