base.bbclass: fix bug with absolute file:// uris
authorChris Larson <chris_larson@mentor.com>
Mon, 30 Aug 2010 23:43:31 +0000 (16:43 -0700)
committerChris Larson <chris_larson@mentor.com>
Mon, 30 Aug 2010 23:43:32 +0000 (16:43 -0700)
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 <chris_larson@mentor.com>
classes/base.bbclass

index afc30da..0d8630e 100644 (file)
@@ -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