diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-13 12:54:01 +0000 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-13 12:54:01 +0000 |
commit | 037615297ccceb86b21971c2222afded83d9fbcd (patch) | |
tree | ab6beb82165a73832412c24bff09cc83cde7602c /lib | |
parent | f6ec708818097f5ea9b23f3dea9fff6779844567 (diff) | |
download | bitbake-contrib-037615297ccceb86b21971c2222afded83d9fbcd.tar.gz |
[fetch] Always add PN to the _revision_key we get from the fetcher
This is extending r1101 to always append something to the
_revision_key of the fetcher. alphaone spotted that it was missing
for the latest_revision case.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bb/fetch/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/bb/fetch/__init__.py b/lib/bb/fetch/__init__.py index c9b589e04..99f4b5821 100644 --- a/lib/bb/fetch/__init__.py +++ b/lib/bb/fetch/__init__.py @@ -502,7 +502,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) @@ -525,8 +525,7 @@ 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 "") + 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") @@ -545,6 +544,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 |