summaryrefslogtreecommitdiffstats
path: root/manifest_xml.py
diff options
context:
space:
mode:
Diffstat (limited to 'manifest_xml.py')
-rw-r--r--manifest_xml.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/manifest_xml.py b/manifest_xml.py
index 7099d5fe..135c91fb 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -507,6 +507,9 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
507 if not d.remote or remote.orig_name != remoteName: 507 if not d.remote or remote.orig_name != remoteName:
508 remoteName = remote.orig_name 508 remoteName = remote.orig_name
509 e.setAttribute('remote', remoteName) 509 e.setAttribute('remote', remoteName)
510 revision = remote.revision or d.revisionExpr
511 if not revision or revision != self._superproject['revision']:
512 e.setAttribute('revision', self._superproject['revision'])
510 root.appendChild(e) 513 root.appendChild(e)
511 514
512 if self._contactinfo.bugurl != Wrapper().BUG_URL: 515 if self._contactinfo.bugurl != Wrapper().BUG_URL:
@@ -914,6 +917,13 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md
914 raise ManifestParseError("no remote for superproject %s within %s" % 917 raise ManifestParseError("no remote for superproject %s within %s" %
915 (name, self.manifestFile)) 918 (name, self.manifestFile))
916 self._superproject['remote'] = remote.ToRemoteSpec(name) 919 self._superproject['remote'] = remote.ToRemoteSpec(name)
920 revision = node.getAttribute('revision') or remote.revision
921 if not revision:
922 revision = self._default.revisionExpr
923 if not revision:
924 raise ManifestParseError('no revision for superproject %s within %s' %
925 (name, self.manifestFile))
926 self._superproject['revision'] = revision
917 if node.nodeName == 'contactinfo': 927 if node.nodeName == 'contactinfo':
918 bugurl = self._reqatt(node, 'bugurl') 928 bugurl = self._reqatt(node, 'bugurl')
919 # This element can be repeated, later entries will clobber earlier ones. 929 # This element can be repeated, later entries will clobber earlier ones.