Skip fetching of metadata.dtd when mymode == "manifest".
authorZac Medico <zmedico@gentoo.org>
Fri, 25 May 2007 00:22:15 +0000 (00:22 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 25 May 2007 00:22:15 +0000 (00:22 -0000)
svn path=/main/trunk/; revision=6618

bin/repoman

index 9cdc25df64e2baafc7ffe2d92ff846d53d8cae28..901b2c3c34df33b97ab6833384189a026a933ae1 100755 (executable)
@@ -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"