fetch/__init__.py: Try and make the sortable_revision code mode readable

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2009-11-04 00:43:13 +00:00
parent aaf9b6aa5f
commit b5a059ff28
4 changed files with 16 additions and 8 deletions

View File

@ -553,8 +553,12 @@ class Fetch(object):
"""
"""
has_sortable_valid = hasattr(self, "_sortable_revision_valid")
has_sortable = hasattr(self, "_sortable_revision")
if has_sortable:
if has_sortable and not has_sortable_valid:
return self._sortable_revision(url, ud, d)
elif has_sortable and self._sortable_revision_valid(url, ud, d):
return self._sortable_revision(url, ud, d)
pd = persist_data.PersistData(d)

View File

@ -145,12 +145,12 @@ class Git(Fetch):
def _build_revision(self, url, ud, d):
return ud.tag
def _want_sortable_revision(self, url, ud, d):
def _sortable_revision_valid(self, url, ud, d):
return bb.data.getVar("BB_GIT_CLONE_FOR_SRCREV", d, True) or False
def _sortable_revision_disabled(self, url, ud, d):
def _sortable_revision(self, url, ud, d):
"""
This is only called when _want_sortable_revision called true
This is only called when _sortable_revision_valid called true
We will have to get the updated revision.
"""

View File

@ -553,8 +553,12 @@ class Fetch(object):
"""
"""
has_sortable_valid = hasattr(self, "_sortable_revision_valid")
has_sortable = hasattr(self, "_sortable_revision")
if has_sortable:
if has_sortable and not has_sortable_valid:
return self._sortable_revision(url, ud, d)
elif has_sortable and self._sortable_revision_valid(url, ud, d):
return self._sortable_revision(url, ud, d)
pd = persist_data.PersistData(d)

View File

@ -145,12 +145,12 @@ class Git(Fetch):
def _build_revision(self, url, ud, d):
return ud.tag
def _want_sortable_revision(self, url, ud, d):
def _sortable_revision_valid(self, url, ud, d):
return bb.data.getVar("BB_GIT_CLONE_FOR_SRCREV", d, True) or False
def _sortable_revision_disabled(self, url, ud, d):
def _sortable_revision(self, url, ud, d):
"""
This is only called when _want_sortable_revision called true
This is only called when _sortable_revision_valid called true
We will have to get the updated revision.
"""