diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-02-07 20:02:36 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-07 20:02:36 +0000 |
| commit | 4e03629af7d6f0fbe2fe207bd40350ce94502f36 (patch) | |
| tree | 0babf41ee5e6fb6012e5f4cb0f77d40764c03bb6 | |
| parent | Ensure that the code for bug #165382 only affects name collisions with virtua... (diff) | |
| download | portage-4e03629af7d6f0fbe2fe207bd40350ce94502f36.tar.gz portage-4e03629af7d6f0fbe2fe207bd40350ce94502f36.tar.bz2 portage-4e03629af7d6f0fbe2fe207bd40350ce94502f36.zip | |
For bug #165783, handle an InvalidDependString exception triggered by an invalid SRC_URI. (trunk r5908)
svn path=/main/branches/2.1.2/; revision=5909
| -rwxr-xr-x | bin/emerge | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bin/emerge b/bin/emerge index af9362abe..a23a36bee 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2485,9 +2485,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: |