From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 5 Oct 2007 03:33:12 +0000 (-0000)
Subject: Eliminate confusing false positive error messages
X-Git-Tag: v2.1.3.16~68
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb458949e7634f7353c8604f58fb495ce04e9871;p=portage.git

Eliminate confusing false positive error messages
for SRC_URI.syntax and digestentry.unused that are
reported when the SRC_URI for one or more ebuilds
can't be parsed for some reason. There's no point
in producing a false error here since the root
cause will produce a valid error elsewhere, such
as "SRC_URI.syntax" or "ebuild.sytax".
(trunk r7905)

svn path=/main/branches/2.1.2/; revision=7941
---

diff --git a/bin/repoman b/bin/repoman
index 49b3d8a64..42e82f855 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -997,18 +997,33 @@ for x in scanlist:
 
 	fetchlist_dict = portage.FetchlistDict(checkdir, repoman_settings, portdb)
 	myfiles_all = []
+	src_uri_error = False
 	for mykey in fetchlist_dict:
 		try:
 			myfiles_all.extend(fetchlist_dict[mykey])
 		except portage_exception.InvalidDependString, e:
-			stats["SRC_URI.syntax"] = stats["SRC_URI.syntax"] + 1
-			fails["SRC_URI.syntax"].append(mykey+".ebuild SRC_URI: "+str(e))
+			src_uri_error = True
+			try:
+				portdb.aux_get(mykey, ["SRC_URI"])
+			except KeyError:
+				# This will be reported as an "ebuild.syntax" error.
+				pass
+			else:
+				stats["SRC_URI.syntax"] = stats["SRC_URI.syntax"] + 1
+				fails["SRC_URI.syntax"].append(
+					"%s.ebuild SRC_URI: %s" % (mykey, e))
 	del fetchlist_dict
-	myfiles_all = set(myfiles_all)
-	for entry in mydigests:
-		if entry not in myfiles_all:
-			stats["digestentry.unused"] += 1
-			fails["digestentry.unused"].append(checkdir+"::"+entry)
+	if not src_uri_error:
+		# This test can produce false positives if SRC_URI could not
+		# be parsed for one or more ebuilds. There's no point in
+		# producing a false error here since the root cause will
+		# produce a valid error elsewhere, such as "SRC_URI.syntax"
+		# or "ebuild.sytax".
+		myfiles_all = set(myfiles_all)
+		for entry in mydigests:
+			if entry not in myfiles_all:
+				stats["digestentry.unused"] += 1
+				fails["digestentry.unused"].append(checkdir+"::"+entry)
 	del myfiles_all
 
 	if os.path.exists(checkdir+"/files"):