summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cooker.py
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2011-01-01 23:55:54 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:54 +0000
commit0090a798eb868ebc926944eac2e6d4a5aff3e1b3 (patch)
tree9b90e66234e6ad7b9616c8c5944029426746110f /bitbake/lib/bb/cooker.py
parente8c48e668c7525257926ab7db9b6e44aa2705483 (diff)
downloadpoky-0090a798eb868ebc926944eac2e6d4a5aff3e1b3.tar.gz
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.py11
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 @@
1#!/usr/bin/env python
1# ex:ts=4:sw=4:sts=4:et 2# ex:ts=4:sw=4:sts=4:et
2# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- 3# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
3# 4#
@@ -483,10 +484,9 @@ class BBCooker:
483 except (IOError, bb.parse.ParseError) as exc: 484 except (IOError, bb.parse.ParseError) as exc:
484 parselog.critical("Unable to parse %s: %s" % (f, exc)) 485 parselog.critical("Unable to parse %s: %s" % (f, exc))
485 sys.exit(1) 486 sys.exit(1)
486
487 data = self.configuration.data
488 487
489 bb.parse.init_parser(data, self.configuration.dump_signatures) 488 data = self.configuration.data
489 bb.parse.init_parser(data)
490 for f in files: 490 for f in files:
491 data = _parse(f, data) 491 data = _parse(f, data)
492 492
@@ -526,9 +526,7 @@ class BBCooker:
526 if bb.data.getVar("BB_WORKERCONTEXT", self.configuration.data) is None: 526 if bb.data.getVar("BB_WORKERCONTEXT", self.configuration.data) is None:
527 bb.fetch.fetcher_init(self.configuration.data) 527 bb.fetch.fetcher_init(self.configuration.data)
528 bb.codeparser.parser_cache_init(self.configuration.data) 528 bb.codeparser.parser_cache_init(self.configuration.data)
529 529 bb.parse.init_parser(data)
530 bb.parse.init_parser(data, self.configuration.dump_signatures)
531
532 bb.event.fire(bb.event.ConfigParsed(), self.configuration.data) 530 bb.event.fire(bb.event.ConfigParsed(), self.configuration.data)
533 531
534 def handleCollections( self, collections ): 532 def handleCollections( self, collections ):
@@ -1043,7 +1041,6 @@ class CookerParser(object):
1043 self.shutdown(clean=False) 1041 self.shutdown(clean=False)
1044 bb.fatal('Error parsing %s: %s' % (exc.recipe, exc)) 1042 bb.fatal('Error parsing %s: %s' % (exc.recipe, exc))
1045 1043
1046
1047 self.current += 1 1044 self.current += 1
1048 self.virtuals += len(result) 1045 self.virtuals += len(result)
1049 if parsed: 1046 if parsed: