From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 25 May 2007 00:22:15 +0000 (-0000)
Subject: Skip fetching of metadata.dtd when mymode == "manifest".
X-Git-Tag: v2.2_pre1~1372
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5064d13b2337bd0e7d16fab422585b73580323bb;p=portage.git

Skip fetching of metadata.dtd when mymode == "manifest".

svn path=/main/trunk/; revision=6618
---

diff --git a/bin/repoman b/bin/repoman
index 9cdc25df6..901b2c3c3 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -54,7 +54,7 @@ import codecs
 
 from portage.manifest import Manifest
 from portage.exception import ParseError
-from portage.process import spawn
+from portage.process import find_binary, spawn
 
 from portage.output import bold, darkgreen, darkred, green, nocolor, red, turquoise, yellow
 
@@ -668,7 +668,9 @@ for x in qacats:
 	fails[x]=[]
 xmllint_capable = False
 metadata_dtd = os.path.join(repoman_settings["DISTDIR"], 'metadata.dtd')
-if getstatusoutput('which xmllint')[0] != 0:
+if mymode == "manifest":
+	pass
+elif not find_binary('xmllint'):
 	print red("!!! xmllint not found. Can't check metadata.xml.\n")
 	if "--xmlparse" in myoptions or repolevel==3:
 		print red("!!!")+" sorry, xmllint is needed.  failing\n"