diff options
| author | Chris Larson <chris_larson@mentor.com> | 2011-02-23 10:17:53 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-08 20:38:26 +0100 |
| commit | 88f4ba28bcc95b64940bd465793a3bb50abf0693 (patch) | |
| tree | 616335fbd7c2caec56c384e6ee190af3329af132 /bitbake/lib | |
| parent | 87dfc1466d91e9d80b122691b965714fd10ab209 (diff) | |
| download | ast2050-yocto-poky-88f4ba28bcc95b64940bd465793a3bb50abf0693.zip ast2050-yocto-poky-88f4ba28bcc95b64940bd465793a3bb50abf0693.tar.gz | |
cooker: simplify self.configuration.data vs data usage
(Bitbake rev: 87112adee4e8add0a97ff8be8311d9afe202412d)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 4f930ee..ad9af7b 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -670,23 +670,22 @@ class BBCooker: data = _parse(os.path.join("conf", "bitbake.conf"), data) - self.configuration.data = data - # Handle any INHERITs and inherit the base class - inherits = ["base"] + (bb.data.getVar('INHERIT', self.configuration.data, True ) or "").split() + inherits = ["base"] + (data.getVar('INHERIT', True) or "").split() for inherit in inherits: - self.configuration.data = _parse(os.path.join('classes', '%s.bbclass' % inherit), self.configuration.data, True ) + data = _parse(os.path.join('classes', '%s.bbclass' % inherit), data, True) # Nomally we only register event handlers at the end of parsing .bb files # We register any handlers we've found so far here... - for var in bb.data.getVar('__BBHANDLERS', self.configuration.data) or []: - bb.event.register(var, bb.data.getVar(var, self.configuration.data)) + for var in bb.data.getVar('__BBHANDLERS', data) or []: + bb.event.register(var, bb.data.getVar(var, data)) - if bb.data.getVar("BB_WORKERCONTEXT", self.configuration.data) is None: - bb.fetch.fetcher_init(self.configuration.data) - bb.codeparser.parser_cache_init(self.configuration.data) + if data.getVar("BB_WORKERCONTEXT", False) is None: + bb.fetch.fetcher_init(data) + bb.codeparser.parser_cache_init(data) bb.parse.init_parser(data) - bb.event.fire(bb.event.ConfigParsed(), self.configuration.data) + bb.event.fire(bb.event.ConfigParsed(), data) + self.configuration.data = data def handleCollections( self, collections ): """Handle collections""" |
