diff options
-rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/cooker.py | 4 | ||||
-rw-r--r-- | 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: | |||
540 | 540 | ||
541 | except IOError, e: | 541 | except IOError, e: |
542 | bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (afile, str(e))) | 542 | bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (afile, str(e))) |
543 | except IOError: | ||
544 | bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile ) | ||
545 | except bb.parse.ParseError, details: | 543 | except bb.parse.ParseError, details: |
546 | bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) ) | 544 | bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) ) |
547 | 545 | ||
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: | |||
404 | 404 | ||
405 | bb.event.fire(bb.event.ConfigParsed(self.configuration.data)) | 405 | bb.event.fire(bb.event.ConfigParsed(self.configuration.data)) |
406 | 406 | ||
407 | except IOError: | 407 | except IOError, e: |
408 | bb.msg.fatal(bb.msg.domain.Parsing, "Unable to open %s" % afile ) | 408 | bb.msg.fatal(bb.msg.domain.Parsing, "IO Error: %s" % str(e) ) |
409 | except bb.parse.ParseError, details: | 409 | except bb.parse.ParseError, details: |
410 | bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) ) | 410 | bb.msg.fatal(bb.msg.domain.Parsing, "Unable to parse %s (%s)" % (afile, details) ) |
411 | 411 | ||
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): | |||
116 | f = open(j, 'r') | 116 | f = open(j, 'r') |
117 | break | 117 | break |
118 | if f is None: | 118 | if f is None: |
119 | raise IOError("file not found") | 119 | raise IOError("file %s not found" % fn) |
120 | else: | 120 | else: |
121 | f = open(fn,'r') | 121 | f = open(fn,'r') |
122 | abs_fn = fn | 122 | abs_fn = fn |