diff options
author | Chris Larson <chris_larson@mentor.com> | 2011-04-04 09:36:10 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-06 15:49:17 +0100 |
commit | 7fc020aa15d918b215575576d91160afae7f4d70 (patch) | |
tree | ed9b029c8b2dfd355396de9183517e852333612b /bitbake/lib/bb/fetch2 | |
parent | fc801b907361cfdb7e329eefac7a0c991e86c736 (diff) | |
download | poky-7fc020aa15d918b215575576d91160afae7f4d70.tar.gz |
persist_data: raise KeyError on missing elements
(Bitbake rev: a4f62433845c29f98c6a9746d5d2847bf9506ea5)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index ca0197e220..a31e26bf75 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -806,12 +806,11 @@ class FetchMethod(object): | |||
806 | pd = persist_data.persist(d) | 806 | pd = persist_data.persist(d) |
807 | revs = pd['BB_URI_HEADREVS'] | 807 | revs = pd['BB_URI_HEADREVS'] |
808 | key = self.generate_revision_key(url, ud, d, name) | 808 | key = self.generate_revision_key(url, ud, d, name) |
809 | rev = revs[key] | 809 | try: |
810 | if rev != None: | 810 | return revs[key] |
811 | return str(rev) | 811 | except KeyError: |
812 | 812 | revs[key] = rev = self._latest_revision(url, ud, d, name) | |
813 | revs[key] = rev = self._latest_revision(url, ud, d, name) | 813 | return rev |
814 | return rev | ||
815 | 814 | ||
816 | def sortable_revision(self, url, ud, d, name): | 815 | def sortable_revision(self, url, ud, d, name): |
817 | """ | 816 | """ |
@@ -825,13 +824,13 @@ class FetchMethod(object): | |||
825 | key = self.generate_revision_key(url, ud, d, name) | 824 | key = self.generate_revision_key(url, ud, d, name) |
826 | 825 | ||
827 | latest_rev = self._build_revision(url, ud, d, name) | 826 | latest_rev = self._build_revision(url, ud, d, name) |
828 | last_rev = localcounts[key + '_rev'] | 827 | last_rev = localcounts.get(key + '_rev') |
829 | uselocalcount = bb.data.getVar("BB_LOCALCOUNT_OVERRIDE", d, True) or False | 828 | uselocalcount = bb.data.getVar("BB_LOCALCOUNT_OVERRIDE", d, True) or False |
830 | count = None | 829 | count = None |
831 | if uselocalcount: | 830 | if uselocalcount: |
832 | count = FetchMethod.localcount_internal_helper(ud, d, name) | 831 | count = FetchMethod.localcount_internal_helper(ud, d, name) |
833 | if count is None: | 832 | if count is None: |
834 | count = localcounts[key + '_count'] or "0" | 833 | count = localcounts.get(key + '_count') or "0" |
835 | 834 | ||
836 | if last_rev == latest_rev: | 835 | if last_rev == latest_rev: |
837 | return str(count + "+" + latest_rev) | 836 | return str(count + "+" + latest_rev) |