From: Chris Larson Date: Tue, 31 Aug 2010 14:29:38 +0000 (-0700) Subject: Revert "base.bbclass: fix bug with absolute file:// uris" X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b4cb64edce429f03cb4802f7df94f52176e4a23;p=openembedded.git Revert "base.bbclass: fix bug with absolute file:// uris" Drop this for now, as it breaks other things. Of course, without this, you once again can no longer have absolute file:// paths the way we used to be able to. Will look into it further. This reverts commit 599b03fe999d41114d124ce663b6c59fa57256d8. --- diff --git a/classes/base.bbclass b/classes/base.bbclass index 0d8630eee0..afc30da9c2 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 = oe.path.join(os.getcwd(), path) + dest = os.path.join(os.getcwd(), path) else: - dest = oe.path.join(os.getcwd(), oe.path.join(host, path)) + dest = os.path.join(os.getcwd(), os.path.join(host, path)) if os.path.exists(dest): if os.path.samefile(file, dest): return True