diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-10 11:21:43 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-06-10 11:21:43 +0100 |
commit | 522cffdb9ecf56efa663052788fc3f0fa8b63ef7 (patch) | |
tree | 5971eb6fa70f6ae744e838b75097d01582ffadd4 /bitbake-dev/lib/bb/fetch/__init__.py | |
parent | 5f37dfd98b624111d573bcdadfad0ee82c999cbe (diff) | |
download | openembedded-core-522cffdb9ecf56efa663052788fc3f0fa8b63ef7.tar.gz openembedded-core-522cffdb9ecf56efa663052788fc3f0fa8b63ef7.tar.bz2 openembedded-core-522cffdb9ecf56efa663052788fc3f0fa8b63ef7.tar.xz openembedded-core-522cffdb9ecf56efa663052788fc3f0fa8b63ef7.zip |
bitbake: Add PN to SRCREV keyhash in the persistent database to avoid conflicts between pacckages (from upstream bitbake)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake-dev/lib/bb/fetch/__init__.py')
-rw-r--r-- | bitbake-dev/lib/bb/fetch/__init__.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bitbake-dev/lib/bb/fetch/__init__.py b/bitbake-dev/lib/bb/fetch/__init__.py index 363358499..39a577b2e 100644 --- a/bitbake-dev/lib/bb/fetch/__init__.py +++ b/bitbake-dev/lib/bb/fetch/__init__.py @@ -508,7 +508,7 @@ class Fetch(object): raise ParameterError pd = persist_data.PersistData(d) - key = self._revision_key(url, ud, d) + key = self.generate_revision_key(url, ud, d) rev = pd.getValue("BB_URI_HEADREVS", key) if rev != None: return str(rev) @@ -521,11 +521,13 @@ class Fetch(object): """ """ - if hasattr(self, "_sortable_revision"): + has_sortable = hasattr(self, "_sortable_revision") + if has_sortable: return self._sortable_revision(url, ud, d) pd = persist_data.PersistData(d) - key = self._revision_key(url, ud, d) + key = self.generate_revision_key(url, ud, d) + latest_rev = self._build_revision(url, ud, d) last_rev = pd.getValue("BB_URI_LOCALCOUNT", key + "_rev") count = pd.getValue("BB_URI_LOCALCOUNT", key + "_count") @@ -543,6 +545,9 @@ class Fetch(object): return str(count + "+" + latest_rev) + def generate_revision_key(self, url, ud, d): + key = self._revision_key(url, ud, d) + return "%s-%s" % (key, bb.data.getVar("PN", d, True) or "") import cvs import git |