diff options
author | Jack Neus <jackneus@google.com> | 2021-06-15 14:28:30 +0000 |
---|---|---|
committer | Jack Neus <jackneus@google.com> | 2021-06-15 18:06:13 +0000 |
commit | b8c84483a55b575277ab791c6834a8682d47f1af (patch) | |
tree | 87df0e2327dba537d0c5d6a1757ced49ac58f1fe | |
parent | d58d0dd3bf40f2c5e754c8a0a622c7d4e58425b8 (diff) | |
download | git-repo-b8c84483a55b575277ab791c6834a8682d47f1af.tar.gz |
repo: improve duplicate default check
If one default is totally empty, we don't need to fail.
BUG=b:187795796
TEST=unit tests
Change-Id: Id226a7a7cd183dbdee58f4681b84885cc9211375
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/309102
Reviewed-by: Mike Frysinger <vapier@google.com>
Tested-by: Jack Neus <jackneus@google.com>
-rw-r--r-- | manifest_xml.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 09cae6f5..ab4be2f5 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
@@ -791,9 +791,10 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md | |||
791 | for node in itertools.chain(*node_list): | 791 | for node in itertools.chain(*node_list): |
792 | if node.nodeName == 'default': | 792 | if node.nodeName == 'default': |
793 | new_default = self._ParseDefault(node) | 793 | new_default = self._ParseDefault(node) |
794 | emptyDefault = not node.hasAttributes() and not node.hasChildNodes() | ||
794 | if self._default is None: | 795 | if self._default is None: |
795 | self._default = new_default | 796 | self._default = new_default |
796 | elif new_default != self._default: | 797 | elif not emptyDefault and new_default != self._default: |
797 | raise ManifestParseError('duplicate default in %s' % | 798 | raise ManifestParseError('duplicate default in %s' % |
798 | (self.manifestFile)) | 799 | (self.manifestFile)) |
799 | 800 | ||