summaryrefslogtreecommitdiffstats
path: root/bitbake
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
parentf1c0c97f4d3f7e56aef375c45eedc2de5ae5f971 (diff)
downloadpoky-d2c925f8a988ba1874a14b19442c46a8f3daa3f3.tar.gz
poky-d2c925f8a988ba1874a14b19442c46a8f3daa3f3.tar.bz2
poky-d2c925f8a988ba1874a14b19442c46a8f3daa3f3.zip
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')
-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):
oldkey = self.generate_revision_key(url, ud, d, branch=False)
latest_rev = self._build_revision(url, ud, d)
- last_rev = localcounts[key + '_rev']
+ last_rev = localcounts.get(key + '_rev')
if last_rev is None:
- last_rev = localcounts[oldkey + '_rev']
+ last_rev = localcounts.get(oldkey + '_rev')
if last_rev is not None:
del localcounts[oldkey + '_rev']
localcounts[key + '_rev'] = last_rev
@@ -281,9 +281,9 @@ class Git(Fetch):
if uselocalcount:
count = Fetch.localcount_internal_helper(ud, d)
if count is None:
- count = localcounts[key + '_count']
+ count = localcounts.get(key + '_count')
if count is None:
- count = localcounts[oldkey + '_count']
+ count = localcounts.get(oldkey + '_count')
if count is not None:
del localcounts[oldkey + '_count']
localcounts[key + '_count'] = count