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.

diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py
index 721eb4d6465aea8bd657e2f9c24d72d31df01f95..8578dc77f80dd93ce2ed4739341e62c62f0428b1 100644 (file)
--- 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")