summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-10-12 22:18:04 +0000
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-10-12 22:18:04 +0000
commit65fbad91c93253fc808d09efd5701f6b443b0131 (patch)
tree4a6767b5f18bd48c0be76903096bbfe7d71e9a38 /lib
parentb7f54f866d30d2382c51992760fcfd49d4635a7f (diff)
downloadbitbake-65fbad91c93253fc808d09efd5701f6b443b0131.tar.gz
Make the revision key unique by adding the PN
If two different recipes (e.g. linux-openmoko and linux-openmoko-devel) use the same git repository but with different SRCREVs the count just incremented on each parsing. By adding PN to the key we keep the count on a per package level. Spotted by Graeme.
Diffstat (limited to 'lib')
-rw-r--r--lib/bb/fetch/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py
index 721eb4d64..8578dc77f 100644
--- a/lib/bb/fetch/__init__.py
+++ b/lib/bb/fetch/__init__.py
@@ -520,6 +520,8 @@ class Fetch(object):
pd = persist_data.PersistData(d)
key = self._revision_key(url, ud, d)
+ key = "%s-%s" % (key, bb.data.getVar("PN", d, True) or "")
+
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")