summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2011-04-06 20:34:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-06 18:16:13 +0100
commitd2c925f8a988ba1874a14b19442c46a8f3daa3f3 (patch)
treeb5fcb442d7428fad837e3a017401373e71092160 /bitbake/lib/bb
parentf1c0c97f4d3f7e56aef375c45eedc2de5ae5f971 (diff)
downloadpoky-d2c925f8a988ba1874a14b19442c46a8f3daa3f3.tar.gz
fetch.git: fix a remnant wrt persist + keyerror
(Bitbake rev: 7492233f5249d348024bc3daa113a96b765f94db) Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch/git.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py
index 9a51ed1387..49c1cfe8f9 100644
--- a/bitbake/lib/bb/fetch/git.py
+++ b/bitbake/lib/bb/fetch/git.py
@@ -269,9 +269,9 @@ class Git(Fetch):
269 oldkey = self.generate_revision_key(url, ud, d, branch=False) 269 oldkey = self.generate_revision_key(url, ud, d, branch=False)
270 270
271 latest_rev = self._build_revision(url, ud, d) 271 latest_rev = self._build_revision(url, ud, d)
272 last_rev = localcounts[key + '_rev'] 272 last_rev = localcounts.get(key + '_rev')
273 if last_rev is None: 273 if last_rev is None:
274 last_rev = localcounts[oldkey + '_rev'] 274 last_rev = localcounts.get(oldkey + '_rev')
275 if last_rev is not None: 275 if last_rev is not None:
276 del localcounts[oldkey + '_rev'] 276 del localcounts[oldkey + '_rev']
277 localcounts[key + '_rev'] = last_rev 277 localcounts[key + '_rev'] = last_rev
@@ -281,9 +281,9 @@ class Git(Fetch):
281 if uselocalcount: 281 if uselocalcount:
282 count = Fetch.localcount_internal_helper(ud, d) 282 count = Fetch.localcount_internal_helper(ud, d)
283 if count is None: 283 if count is None:
284 count = localcounts[key + '_count'] 284 count = localcounts.get(key + '_count')
285 if count is None: 285 if count is None:
286 count = localcounts[oldkey + '_count'] 286 count = localcounts.get(oldkey + '_count')
287 if count is not None: 287 if count is not None:
288 del localcounts[oldkey + '_count'] 288 del localcounts[oldkey + '_count']
289 localcounts[key + '_count'] = count 289 localcounts[key + '_count'] = count