summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2008-12-06 12:31:30 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2008-12-06 12:31:30 +0000
commit2bdc6dc6f48e183d40a13272cb401644528b52f0 (patch)
tree1d7223f2b45289b9de91c813e693991c08064dae
parent70462784767c7b6b5034c77f4fa00274b0ba2e24 (diff)
downloadbitbake-2bdc6dc6f48e183d40a13272cb401644528b52f0.tar.gz
cooker.py: Update to improve handling of the trytaltconfigs option (from Poky)
-rw-r--r--lib/bb/cooker.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 50624d8d3..58f67bda8 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -194,7 +194,7 @@ class BBCooker:
bb.data.update_data(localdata)
bb.data.expandKeys(localdata)
- taskdata = bb.taskdata.TaskData(self.configuration.abort)
+ taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs)
try:
taskdata.add_provider(localdata, self.status, pkgs_to_build[0])
@@ -243,7 +243,7 @@ class BBCooker:
localdata = data.createCopy(self.configuration.data)
bb.data.update_data(localdata)
bb.data.expandKeys(localdata)
- taskdata = bb.taskdata.TaskData(self.configuration.abort)
+ taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs)
runlist = []
try:
@@ -404,8 +404,8 @@ class BBCooker:
bb.event.fire(bb.event.ConfigParsed(self.configuration.data))
- except IOError:
- bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile )
+ except IOError, e:
+ bb.msg.fatal(bb.msg.domain.Parsing, "IO Error: %s" % str(e) )
except bb.parse.ParseError, details:
bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) )
@@ -500,7 +500,7 @@ class BBCooker:
bb.build.del_stamp('do_%s' % self.configuration.cmd, self.configuration.data)
# Setup taskdata structure
- taskdata = bb.taskdata.TaskData(self.configuration.abort)
+ taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs)
taskdata.add_provider(self.configuration.data, self.status, item)
buildname = bb.data.getVar("BUILDNAME", self.configuration.data)
@@ -534,7 +534,7 @@ class BBCooker:
bb.data.update_data(localdata)
bb.data.expandKeys(localdata)
- taskdata = bb.taskdata.TaskData(self.configuration.abort)
+ taskdata = bb.taskdata.TaskData(self.configuration.abort, self.configuration.tryaltconfigs)
runlist = []
try: