summaryrefslogtreecommitdiffstats
path: root/manifest_xml.py
diff options
context:
space:
mode:
authorChris Allen <chris.allen@arm.com>2023-10-20 16:35:39 +0100
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-10-20 18:22:59 +0000
commit7393f6bc414ae5d140101fffcb48148a36b80f64 (patch)
tree636b5fc909145e85e7e0ab160b8241287ae6cbf0 /manifest_xml.py
parent8dd85218541f66b5c6740e46ebb3ebbcfc585af1 (diff)
downloadgit-repo-7393f6bc414ae5d140101fffcb48148a36b80f64.tar.gz
manifest_xml: Fix empty project list when DOCTYPE is present
When parsing the manifest XML, the code looks for a top level DOM node named "manifest". However, it doesn't check that it's an element type node so if there is also an XML document type declaration node present (which has the same name as the root element) then it selects the wrong node and hence you end up with no projects defined at all. Change-Id: I8d101caffbbc2a06e56136ff21302e3f09cfc96b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/390357 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Chris Allen <chris.allen@arm.com> Commit-Queue: Chris Allen <chris.allen@arm.com>
Diffstat (limited to 'manifest_xml.py')
-rw-r--r--manifest_xml.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py
index 03925176..0068ac6a 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -1266,7 +1266,10 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
1266 raise ManifestParseError("no root node in %s" % (path,)) 1266 raise ManifestParseError("no root node in %s" % (path,))
1267 1267
1268 for manifest in root.childNodes: 1268 for manifest in root.childNodes:
1269 if manifest.nodeName == "manifest": 1269 if (
1270 manifest.nodeType == manifest.ELEMENT_NODE
1271 and manifest.nodeName == "manifest"
1272 ):
1270 break 1273 break
1271 else: 1274 else:
1272 raise ManifestParseError("no <manifest> in %s" % (path,)) 1275 raise ManifestParseError("no <manifest> in %s" % (path,))