summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-08-31 07:29:38 -0700
committerChris Larson <chris_larson@mentor.com>2010-08-31 07:29:38 -0700
commit7b4cb64edce429f03cb4802f7df94f52176e4a23 (patch)
tree0777f00feb31d2f3d3023edccd5e4eac29f66681 /classes
parentec73d417a0a68b0ee398d750a437227ba18da650 (diff)
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.
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass4
1 files changed, 2 insertions, 2 deletions
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