summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/parse/__init__.py3
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py
index 3f93ad2..c973f6f 100644
--- a/bitbake/lib/bb/parse/__init__.py
+++ b/bitbake/lib/bb/parse/__init__.py
@@ -107,6 +107,9 @@ def resolve_file(fn, d):
107 raise IOError("file %s not found in %s" % (fn, bbpath)) 107 raise IOError("file %s not found in %s" % (fn, bbpath))
108 fn = newfn 108 fn = newfn
109 109
110 if not os.path.isfile(fn):
111 raise IOError("file %s not found" % fn)
112
110 logger.debug(2, "LOAD %s", fn) 113 logger.debug(2, "LOAD %s", fn)
111 return fn 114 return fn
112 115
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 7d4a5b1..7b30c8a 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -89,7 +89,7 @@ def include(oldfn, fn, lineno, data, error_out):
89 from bb.parse import handle 89 from bb.parse import handle
90 try: 90 try:
91 ret = handle(fn, data, True) 91 ret = handle(fn, data, True)
92 except IOError: 92 except (IOError, OSError):
93 if error_out: 93 if error_out:
94 raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), oldfn, lineno) 94 raise ParseError("Could not %(error_out)s file %(fn)s" % vars(), oldfn, lineno)
95 logger.debug(2, "CONF file '%s' not found", fn) 95 logger.debug(2, "CONF file '%s' not found", fn)