summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/repoman11
1 files changed, 8 insertions, 3 deletions
diff --git a/bin/repoman b/bin/repoman
index 901b2c3c3..f47911665 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -980,10 +980,15 @@ for x in scanlist:
else:
#Only carry out if in package directory or check forced
if xmllint_capable:
- st = spawn(["xmllint", "--nonet", "--noout", "--nowarning", "--dtdvalid",
- metadata_dtd, os.path.join(checkdir, "metadata.xml")])
+ # xmlint can produce garbage output even on success, so only dump
+ # the ouput when it fails.
+ st, out = getstatusoutput(
+ "xmllint --nonet --noout --dtdvalid '%s' '%s'" % \
+ (metadata_dtd, os.path.join(checkdir, "metadata.xml")))
if st != os.EX_OK:
- print red("!!! metadata.xml is invalid")
+ print red("!!!") + " metadata.xml is invalid:"
+ for z in out.splitlines():
+ print red("!!! ")+z
stats["metadata.bad"]+=1
fails["metadata.bad"].append(x+"/metadata.xml")