From d228f9d938ecde959621d03fdd6c70ea467b5f39 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 19 May 2013 13:17:58 +0300 Subject: bitbake: fetch2/git: Clean up sortable_revision Now we no longer try and provide increasing values from the fetcher, we can simplify the function structure for the sortable_revision pieces and move the AUTOINC handling directly into the function which needs it, simplifying the code. (Bitbake rev: fb068bee47bb1a06f02447daf16c2b2a79c03288) Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 27 ++++++++++----------------- bitbake/lib/bb/fetch2/bzr.py | 4 ++-- bitbake/lib/bb/fetch2/svn.py | 4 ++-- 3 files changed, 14 insertions(+), 21 deletions(-) (limited to 'bitbake/lib/bb/fetch2') diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 9029a5a83c..6443303ca2 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -619,7 +619,10 @@ def get_srcrev(d): raise FetchError("SRCREV was used yet no valid SCM was found in SRC_URI") if len(scms) == 1 and len(urldata[scms[0]].names) == 1: - return urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d, urldata[scms[0]].names[0]) + autoinc, rev = urldata[scms[0]].method.sortable_revision(scms[0], urldata[scms[0]], d, urldata[scms[0]].names[0]) + if autoinc: + return "AUTOINC+" + rev + return rev # # Mutiple SCMs are in SRC_URI so we resort to SRCREV_FORMAT @@ -628,18 +631,14 @@ def get_srcrev(d): if not format: raise FetchError("The SRCREV_FORMAT variable must be set when multiple SCMs are used.") - autoinc = False - autoinc_templ = 'AUTOINC+' + seenautoinc = False for scm in scms: ud = urldata[scm] for name in ud.names: - rev = ud.method.sortable_revision(scm, ud, d, name) - if rev.startswith(autoinc_templ): - if not autoinc: - autoinc = True - format = "%s%s" % (autoinc_templ, format) - rev = rev[len(autoinc_templ):] - + autoinc, rev = ud.method.sortable_revision(scm, ud, d, name) + if autoinc and not seenautoinc: + rev = "AUTOINC+" + rev + seenautoinc format = format.replace(name, rev) return format @@ -1277,14 +1276,8 @@ class FetchMethod(object): return rev def sortable_revision(self, url, ud, d, name): - """ - - """ - if hasattr(self, "_sortable_revision"): - return self._sortable_revision(url, ud, d) - latest_rev = self._build_revision(url, ud, d, name) - return 'AUTOINC+%s' % str(latest_rev) + return True, str(latest_rev) def generate_revision_key(self, url, ud, d, name): key = self._revision_key(url, ud, d, name) diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index 58e80c81f6..5d9e5f907c 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py @@ -132,12 +132,12 @@ class Bzr(FetchMethod): return output.strip() - def _sortable_revision(self, url, ud, d): + def sortable_revision(self, url, ud, d, name): """ Return a sortable revision number which in our case is the revision number """ - return self._build_revision(url, ud, d) + return False, self._build_revision(url, ud, d) def _build_revision(self, url, ud, d): return ud.revision diff --git a/bitbake/lib/bb/fetch2/svn.py b/bitbake/lib/bb/fetch2/svn.py index cbf929e9c5..9a779d2448 100644 --- a/bitbake/lib/bb/fetch2/svn.py +++ b/bitbake/lib/bb/fetch2/svn.py @@ -178,12 +178,12 @@ class Svn(FetchMethod): return revision - def _sortable_revision(self, url, ud, d): + def sortable_revision(self, url, ud, d, name): """ Return a sortable revision number which in our case is the revision number """ - return self._build_revision(url, ud, d) + return False, self._build_revision(url, ud, d) def _build_revision(self, url, ud, d): return ud.revision -- cgit v1.2.3-54-g00ecf