From 77bdb1a1175e21af65e8c50f708b930d011a2e01 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 17 Nov 2009 15:44:43 +0100 Subject: [PATCH 2/2] BB_GIT_CLONE_FOR_SRCREV using only _sortable_buildnumber() for known revision --- lib/bb/fetch/__init__.py | 15 ++++++++------- lib/bb/fetch/git.py | 33 +++++++++------------------------ 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py index 9508908..cc095e3 100644 --- a/lib/bb/fetch/__init__.py +++ b/lib/bb/fetch/__init__.py @@ -553,15 +553,13 @@ class Fetch(object): """ """ - has_want_sortable = hasattr(self, "_want_sortable_revision") - has_sortable = hasattr(self, "_sortable_revision") + has_want_sortable_buildnumber = hasattr(self, "_want_sortable_buildnumber") + has_sortable_buildnumber = hasattr(self, "_sortable_buildnumber") + has_sortable_revision = hasattr(self, "_sortable_revision") - if not has_want_sortable and has_sortable: + if has_sortable_revision: return self._sortable_revision(url, ud, d) - elif has_want_sortable and self._want_sortable_revision(url, ud, d) and has_sortable: - return self._sortable_revision(url, ud, d) - - + pd = persist_data.PersistData(d) key = self.generate_revision_key(url, ud, d) @@ -577,6 +575,9 @@ class Fetch(object): if last_rev == latest_rev: return str(count + "+" + latest_rev) + if has_sortable_buildnumber and has_want_sortable_buildnumber and self._want_sortable_buildnumber(url, ud, d): + count = self._sortable_buildnumber(url, ud, d, latest_rev) + if count is None: count = "0" elif uselocalcount: diff --git a/lib/bb/fetch/git.py b/lib/bb/fetch/git.py index 5cdf656..4dd58b0 100644 --- a/lib/bb/fetch/git.py +++ b/lib/bb/fetch/git.py @@ -146,44 +146,29 @@ class Git(Fetch): def _build_revision(self, url, ud, d): return ud.tag - def _want_sortable_revision(self, url, ud, d): + def _want_sortable_buildnumber(self, url, ud, d): return bb.data.getVar("BB_GIT_CLONE_FOR_SRCREV", d, True) or False - def _sortable_revision(self, url, ud, d): + def _sortable_buildnumber(self, url, ud, d, rev): """ - This is only called when _want_sortable_revision called true + This is only called when _want_sortable_buildnumber called true - We will have to get the updated revision. + Latest revision is already known, we need only to count revisions in git repo. """ gitsrcname = '%s%s' % (ud.host, ud.path.replace('/', '.')) repodir = os.path.join(data.expand('${GITDIR}', d), gitsrcname) - key = "GIT_CACHED_REVISION-%s-%s" % (gitsrcname, ud.tag) - if bb.data.getVar(key, d): - return bb.data.getVar(key, d) - - - # Runtime warning on wrongly configured sources - if ud.tag == "1": - bb.msg.error(1, bb.msg.domain.Fetcher, "SRCREV is '1'. This indicates a configuration error of %s" % url) - return "0+1" - cwd = os.getcwd() # Check if we have the rev already if not os.path.exists(repodir): - print "no repo" - self.go(None, ud, d) + bb.msg.error(bb.msg.domain.Fetcher, "GIT repository for %s doesn't exist in %s, cannot get sortable buildnumber" % (url, repodir)) + return "0" os.chdir(repodir) - if not self._contains_ref(ud.tag, d): - self.go(None, ud, d) - output = runfetchcmd("git rev-list %s -- 2> /dev/null | wc -l" % ud.tag, d, quiet=True) + output = runfetchcmd("git rev-list %s -- 2> /dev/null | wc -l" % rev, d, quiet=True) os.chdir(cwd) - sortable_revision = "%s+%s" % (output.split()[0], ud.tag) - bb.data.setVar(key, sortable_revision, d) - return sortable_revision - - + sortable_buildnumber= "%s" % (output.split()[0]) + return sortable_buildnumber -- 1.6.5.2