Include the package name in all exceptions raised from

portdbapi.getfetchlist() so that a redundant and
sometimes inaccurate message doesn't have to be shown
when the error is caught in digestgen().

svn path=/main/trunk/; revision=7917

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 3f180288d9fb6696e12659222311530a9d162dac..608214f0a88ddb151ef2b8adedb6e295225feb40 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3065,7 +3065,6 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
                                        distfiles_map.setdefault(myfile, []).append(cpv)
                        except portage.exception.InvalidDependString, e:
                                writemsg("!!! %s\n" % str(e), noiselevel=-1)
-                               writemsg("!!! Invalid SRC_URI for '%s'.\n" % cpv, noiselevel=-1)
                                del e
                                return 0
                mytree = os.path.dirname(os.path.dirname(mysettings["O"]))

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 2c205ae9ed31170bfe911a8dd644d3762fd268be..824d1afc437f5201071e741223b18409074c9320 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -383,7 +383,8 @@ class portdbapi(dbapi):
                        # Convert this to an InvalidDependString exception
                        # since callers already handle it.
                        raise portage.exception.InvalidDependString(
-                               "getfetchlist(): Unsupported EAPI: '%s'" % eapi.lstrip("-"))
+                               "getfetchlist(): '%s' has unsupported EAPI: '%s'" % \
+                               (mypkg, eapi.lstrip("-")))
 
                if useflags is None:
                        useflags = mysettings["USE"].split()
@@ -396,7 +397,9 @@ class portdbapi(dbapi):
                for x in newuris:
                        mya = os.path.basename(x)
                        if not mya:
-                               raise portage.exception.InvalidDependString("URI has no basename: '%s'" % x)
+                               raise portage.exception.InvalidDependString(
+                                       "getfetchlist(): '%s' SRC_URI has no file name: '%s'" % \
+                                       (mypkg, x))
                        if not mya in myfiles:
                                myfiles.append(mya)
                return [newuris, myfiles]