summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-05-25 00:23:16 +0000
committerZac Medico <zmedico@gentoo.org>2007-05-25 00:23:16 +0000
commitbcf23f7e36ccbd6ba6274b152c1de1ee2485078c (patch)
treecb26359a622093795812257c752cf92f70b50991
parentd64853ea10f497f46df9a70689a12b7455cb18ee (diff)
downloadportage-2.1.2.8.tar.gz
portage-2.1.2.8.tar.bz2
portage-2.1.2.8.zip
Skip fetching of metadata.dtd when mymode == "manifest". (trunk r6618)v2.1.2.8
svn path=/main/branches/2.1.2/; revision=6619
-rwxr-xr-xbin/repoman6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman
index 36097550c..003caeb32 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -42,7 +42,7 @@ import codecs
from portage_manifest import Manifest
from portage_exception import ParseError
-from portage_exec import spawn
+from portage_exec import find_binary, spawn
from output import bold, darkgreen, darkred, green, nocolor, red, turquoise, yellow
@@ -656,7 +656,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"