From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 7 Jun 2010 20:16:16 +0000 (+0100)
Subject: base.bbclass: Fix after bb.decodeurl was fixed
X-Git-Tag: 2011-1~5921
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=2160dddcc14d9378aff5d48ee72e3dc39b4ab8c7;p=openembedded-core.git

base.bbclass: Fix after bb.decodeurl was fixed

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 5594bb72d3..a67555dc68 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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))