diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-01 23:55:54 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:54 +0000 |
commit | 0090a798eb868ebc926944eac2e6d4a5aff3e1b3 (patch) | |
tree | 9b90e66234e6ad7b9616c8c5944029426746110f /bitbake/lib/bb/cooker.py | |
parent | e8c48e668c7525257926ab7db9b6e44aa2705483 (diff) | |
download | openembedded-core-0090a798eb868ebc926944eac2e6d4a5aff3e1b3.tar.gz openembedded-core-0090a798eb868ebc926944eac2e6d4a5aff3e1b3.tar.bz2 openembedded-core-0090a798eb868ebc926944eac2e6d4a5aff3e1b3.zip |
bitbake: Sync a load of whitespace and other non-functionality changes with bitbake uptream
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 9c48194a61..23fd72f432 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # ex:ts=4:sw=4:sts=4:et # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- # @@ -483,10 +484,9 @@ class BBCooker: except (IOError, bb.parse.ParseError) as exc: parselog.critical("Unable to parse %s: %s" % (f, exc)) sys.exit(1) - - data = self.configuration.data - bb.parse.init_parser(data, self.configuration.dump_signatures) + data = self.configuration.data + bb.parse.init_parser(data) for f in files: data = _parse(f, data) @@ -526,9 +526,7 @@ class BBCooker: 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) - - bb.parse.init_parser(data, self.configuration.dump_signatures) - + bb.parse.init_parser(data) bb.event.fire(bb.event.ConfigParsed(), self.configuration.data) def handleCollections( self, collections ): @@ -1043,7 +1041,6 @@ class CookerParser(object): self.shutdown(clean=False) bb.fatal('Error parsing %s: %s' % (exc.recipe, exc)) - self.current += 1 self.virtuals += len(result) if parsed: |