From: Chris Larson Date: Mon, 30 Aug 2010 23:43:31 +0000 (-0700) Subject: base.bbclass: fix bug with absolute file:// uris X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=599b03fe999d41114d124ce663b6c59fa57256d8;p=openembedded.git base.bbclass: fix bug with absolute file:// uris The code which used host/path from the url to construct the destination of the copy was using os.path.join. os.path.join treats a "/" in an element as an indication to drop all previous elements, so the full path resulted in a destination exactly the same as the source, resulting in a no-op unpack. Fixed by using oe.path.join instead. Signed-off-by: Chris Larson --- diff --git a/classes/base.bbclass b/classes/base.bbclass index afc30da9c2..0d8630eee0 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -231,9 +231,9 @@ def oe_unpack_file(file, data, url = None): if not cmd: return True if not host: - dest = os.path.join(os.getcwd(), path) + dest = oe.path.join(os.getcwd(), path) else: - dest = os.path.join(os.getcwd(), os.path.join(host, path)) + dest = oe.path.join(os.getcwd(), oe.path.join(host, path)) if os.path.exists(dest): if os.path.samefile(file, dest): return True