summaryrefslogtreecommitdiffstats
path: root/lib/bb/fetch
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-12-29 18:39:50 -0700
committerChris Larson <chris_larson@mentor.com>2010-12-29 18:39:50 -0700
commitd88dfcc749c57bb7ea3f5293ad6c6c687f7bb258 (patch)
tree8f234539d3a5d03f7267b94ee59339e23cfbdb70 /lib/bb/fetch
parent4d9e3f12a2eac8fe9999e6822f0dcd8498d99330 (diff)
downloadbitbake-d88dfcc749c57bb7ea3f5293ad6c6c687f7bb258.tar.gz
fetch: handle no sortable_buildindex for git
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib/bb/fetch')
-rw-r--r--lib/bb/fetch/git.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/bb/fetch/git.py b/lib/bb/fetch/git.py
index 77e6b6ce8..b37a09743 100644
--- a/lib/bb/fetch/git.py
+++ b/lib/bb/fetch/git.py
@@ -291,11 +291,15 @@ class Git(Fetch):
if last_rev == latest_rev:
return str(count + "+" + latest_rev)
- count = self._sortable_buildindex(url, ud, d, latest_rev)
- if count is not None:
+ buildindex_provided = hasattr(self, "_sortable_buildindex")
+ if buildindex_provided:
+ count = self._sortable_buildindex(url, ud, d, latest_rev)
+ if count is None:
+ count = "0"
+ elif uselocalcount or buildindex_provided:
count = str(count)
else:
- count = '0'
+ count = str(int(count) + 1)
localcounts[key + '_rev'] = latest_rev
localcounts[key + '_count'] = count