]> code.ossystems Code Review - openembedded-core.git/commitdiff
base.bbclass: Fix after bb.decodeurl was fixed
authorRichard Purdie <rpurdie@linux.intel.com>
Mon, 7 Jun 2010 20:16:16 +0000 (21:16 +0100)
committerRichard Purdie <rpurdie@linux.intel.com>
Mon, 7 Jun 2010 20:16:16 +0000 (21:16 +0100)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
meta/classes/base.bbclass

index 5594bb72d3281eec56b3077feb1fbf43486c8420..a67555dc68e3e3ed72a9fcf52bcb3ba530e63f72 100644 (file)
@@ -269,8 +269,8 @@ def oe_unpack_file(file, data, url = None):
                if not 'patch' in parm:
                        # The "destdir" handling was specifically done for FILESPATH
                        # items.  So, only do so for file:// entries.
-                       if type == "file":
-                               destdir = bb.decodeurl(url)[1] or "."
+                       if type == "file" and path.find("/") != -1:
+                               destdir = path.rsplit("/", 1)[0]
                        else:
                                destdir = "."
                        bb.mkdirhier("%s/%s" % (os.getcwd(), destdir))