android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Better handling of duplicate default"

Browse Source
This commit is contained in:
David Pursehouse 2013-10-15 01:40:07 +00:00 committed by Gerrit Code Review
commit 143b4cc992
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
manifest_xml.py
View File

@ -51,6 +51,12 @@ class _Default(object):
sync_c = False
sync_s = False
def __eq__(self, other):
return self.__dict__ == other.__dict__
def __ne__(self, other):
return self.__dict__ != other.__dict__
class _XmlRemote(object):
def __init__(self,
name,
@ -427,11 +433,14 @@ class XmlManifest(object):
for node in itertools.chain(*node_list):
if node.nodeName == 'default':
if self._default is not None:
raise ManifestParseError(
'duplicate default in %s' %
(self.manifestFile))
self._default = self._ParseDefault(node)
new_default = self._ParseDefault(node)
if self._default is None:
self._default = new_default
elif new_default != self._default:
raise ManifestParseError(
'duplicate default in %s' %
(self.manifestFile))
if self._default is None:
self._default = _Default()