mirror of
https://github.com/Dev-Wiki/git-repo.git
synced 2025-12-13 08:04:02 +08:00
repo: properly handle NoneType in Default/Remote equality checks
BUG=none TEST=none Change-Id: I4ccdbbc7ba4b6f6e20c6959db1b46fdb44ea2819 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/308982 Reviewed-by: Mike Frysinger <vapier@google.com> Tested-by: Jack Neus <jackneus@google.com>
This commit is contained in:
@@ -122,9 +122,13 @@ class _Default(object):
|
||||
sync_tags = True
|
||||
|
||||
def __eq__(self, other):
|
||||
if not isinstance(other, _Default):
|
||||
return False
|
||||
return self.__dict__ == other.__dict__
|
||||
|
||||
def __ne__(self, other):
|
||||
if not isinstance(other, _Default):
|
||||
return True
|
||||
return self.__dict__ != other.__dict__
|
||||
|
||||
|
||||
@@ -147,12 +151,18 @@ class _XmlRemote(object):
|
||||
self.resolvedFetchUrl = self._resolveFetchUrl()
|
||||
|
||||
def __eq__(self, other):
|
||||
if not isinstance(other, _XmlRemote):
|
||||
return False
|
||||
return self.__dict__ == other.__dict__
|
||||
|
||||
def __ne__(self, other):
|
||||
if not isinstance(other, _XmlRemote):
|
||||
return True
|
||||
return self.__dict__ != other.__dict__
|
||||
|
||||
def _resolveFetchUrl(self):
|
||||
if self.fetchUrl is None:
|
||||
return ''
|
||||
url = self.fetchUrl.rstrip('/')
|
||||
manifestUrl = self.manifestUrl.rstrip('/')
|
||||
# urljoin will gets confused over quite a few things. The ones we care
|
||||
|
||||
Reference in New Issue
Block a user