From b6b37f065c5715c04442184ca20c86258f1c1714 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 6 Nov 2008 00:12:31 +0000 Subject: [PATCH] bitbake: Improve error message for missing class files --- bitbake-dev/lib/bb/cooker.py | 2 -- bitbake/lib/bb/cooker.py | 4 ++-- bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index ead76ca6ba..86229799f2 100644 --- 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 c5d640da80..6a6d254d7a 100644 --- 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 cc8bc92e1d..583a71c0ba 100644 --- 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