From 7fc020aa15d918b215575576d91160afae7f4d70 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 4 Apr 2011 09:36:10 -0700 Subject: persist_data: raise KeyError on missing elements (Bitbake rev: a4f62433845c29f98c6a9746d5d2847bf9506ea5) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch/git.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'bitbake/lib/bb/fetch/git.py') diff --git a/bitbake/lib/bb/fetch/git.py b/bitbake/lib/bb/fetch/git.py index 6b565e3eb5..35908ca8d4 100644 --- a/bitbake/lib/bb/fetch/git.py +++ b/bitbake/lib/bb/fetch/git.py @@ -246,18 +246,20 @@ class Git(Fetch): revs = persisted['BB_URI_HEADREVS'] key = self.generate_revision_key(url, ud, d, branch=True) - rev = revs[key] - if rev is None: + + try: + return revs[key] + except KeyError: # Compatibility with old key format, no branch included oldkey = self.generate_revision_key(url, ud, d, branch=False) - rev = revs[oldkey] - if rev is not None: - del revs[oldkey] - else: + try: + rev = revs[oldkey] + except KeyError: rev = self._latest_revision(url, ud, d) + else: + del revs[oldkey] revs[key] = rev - - return str(rev) + return rev def sortable_revision(self, url, ud, d): """ -- cgit v1.2.3-54-g00ecf