base.bbclass: Abort early if localpath() was unable to find a local file for the...

Signed-off-by: Chris Larson <clarson@mvista.com>

diff --git a/classes/base.bbclass b/classes/base.bbclass
index f39059e..919d01d 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -794,7 +794,9 @@ python base_do_unpack() {
                try:
                        local = bb.data.expand(bb.fetch.localpath(url, localdata), localdata)
                except bb.MalformedUrl, e:
-                       raise FuncFailed('Unable to generate local path for malformed uri: %s' % e)
+                       raise bb.build.FuncFailed('Unable to generate local path for malformed uri: %s' % e)
+               if not local:
+                       raise bb.build.FuncFailed('Unable to locate local file for %s' % url)
                local = os.path.realpath(local)
                ret = oe_unpack_file(local, localdata, url)
                if not ret: