bitbake: Improve error message for missing class files

diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py
index ead76ca6baa0b0ec7edf50035afe406a9d7f2a27..86229799f28f62e6b538efd9828bf26e8e4e24de 100644 (file)
--- a/bitbake-dev/lib/bb/cooker.py
+++ b/bitbake-dev/lib/bb/cooker.py
@@ -540,8 +540,6 @@ class BBCooker:
 
         except IOError, e:
             bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (afile, str(e)))
-        except IOError:
-            bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile )
         except bb.parse.ParseError, details:
             bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) )
 

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index c5d640da80fe9bff4307e0d1176f883f7896d7f5..6a6d254d7a1188b17256f6f1ef287fcbc44bef8e 100644 (file)
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -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) )
 

diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index cc8bc92e1dbd55d0dfa8953eea4ec2a3cb82b7d8..583a71c0ba05323f9edf4d6a3f2854d5a3166dde 100644 (file)
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -116,7 +116,7 @@ def handle(fn, d, include = 0):
                 f = open(j, 'r')
                 break
         if f is None:
-            raise IOError("file not found")
+            raise IOError("file %s not found" % fn)
     else:
         f = open(fn,'r')
         abs_fn = fn