diff options
| author | Joshua Lock <josh@linux.intel.com> | 2008-11-06 00:33:24 +0000 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2008-11-06 00:33:24 +0000 |
| commit | fa7a4cd807bf819c11d79ac0b22d8dc7246953e2 (patch) | |
| tree | 20a821e8d16cb4326aa808c304240234cfeeaaa6 /bitbake/lib | |
| parent | 3ae3b2ba8a20c44b20ff322690872ff3f2893bee (diff) | |
| parent | b6b37f065c5715c04442184ca20c86258f1c1714 (diff) | |
| download | poky-fa7a4cd807bf819c11d79ac0b22d8dc7246953e2.tar.gz | |
Merge branch 'master' of ssh://git@git.moblin.org/poky
Diffstat (limited to 'bitbake/lib')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 2 |
2 files changed, 3 insertions, 3 deletions
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 |