[oe-commits] [bitbake] 06/17: cookerdata: Avoid tracebacks from early reset() calls

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 8fd30ca6d271c125a8ea03ef0c5d7ab176900701
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Aug 31 17:11:46 2017 +0100

    cookerdata: Avoid tracebacks from early reset() calls
    
    cooker.reset() can be called before we've actually setup the datastore. Gracefully
    handle this case instead of the current traceback+exit.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cookerdata.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index d105ab7..2c9019f 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -327,6 +327,9 @@ class CookerDataBuilder(object):
         self.mcdata[''] = self.data
 
     def reset(self):
+        # We may not have run parseBaseConfiguration() yet
+        if not hasattr(self, 'origdata'):
+            return
         self.data = bb.data.createCopy(self.origdata)
         self.mcdata[''] = self.data
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.