From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 6 May 2011 02:21:12 +0000 (-0700)
Subject: cooker: use logger.exception for config file parse errors
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97504f2bc865c3c2dc94fb8bdd3d2e3a027647dd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

cooker: use logger.exception for config file parse errors

(Bitbake rev: 775590c154bc189df3f5704bddf9b684b734fde0)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 658a7b06575..293ad355b8d 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -113,7 +113,13 @@ class BBCooker:
 
         bb.data.inheritFromOS(self.configuration.data)
 
-        self.parseConfigurationFiles(self.configuration.file)
+        try:
+            self.parseConfigurationFiles(self.configuration.file)
+        except SyntaxError:
+            sys.exit(1)
+        except Exception:
+            logger.exception("Error parsing configuration files")
+            sys.exit(1)
 
         if not self.configuration.cmd:
             self.configuration.cmd = bb.data.getVar("BB_DEFAULT_TASK", self.configuration.data, True) or "build"