diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index a1620b0162..3a25956625 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -70,12 +70,16 @@ class BBCooker: | |||
70 | self.cache = None | 70 | self.cache = None |
71 | self.bb_cache = None | 71 | self.bb_cache = None |
72 | 72 | ||
73 | self.server = server.BitBakeServer(self) | 73 | if server: |
74 | self.server = server.BitBakeServer(self) | ||
74 | 75 | ||
75 | self.configuration = configuration | 76 | self.configuration = configuration |
76 | 77 | ||
77 | self.configuration.data = bb.data.init() | 78 | self.configuration.data = bb.data.init() |
78 | 79 | ||
80 | if not server: | ||
81 | bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data) | ||
82 | |||
79 | bb.data.inheritFromOS(self.configuration.data) | 83 | bb.data.inheritFromOS(self.configuration.data) |
80 | 84 | ||
81 | self.parseConfigurationFiles(self.configuration.file) | 85 | self.parseConfigurationFiles(self.configuration.file) |
@@ -544,7 +548,6 @@ class BBCooker: | |||
544 | 548 | ||
545 | bb.event.fire(bb.event.ConfigParsed(), self.configuration.data) | 549 | bb.event.fire(bb.event.ConfigParsed(), self.configuration.data) |
546 | 550 | ||
547 | |||
548 | except IOError as e: | 551 | except IOError as e: |
549 | bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (files, str(e))) | 552 | bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (files, str(e))) |
550 | except bb.parse.ParseError as details: | 553 | except bb.parse.ParseError as details: |