[oe-commits] Chris Larson : base.bbclass: fix bug with absolute file:// uris
git version control
git at git.openembedded.org
Tue Sep 7 14:33:28 UTC 2010
Module: openembedded.git
Branch: testing-next
Commit: 599b03fe999d41114d124ce663b6c59fa57256d8
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=599b03fe999d41114d124ce663b6c59fa57256d8
Author: Chris Larson <chris_larson at mentor.com>
Date: Mon Aug 30 16:43:31 2010 -0700
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 <chris_larson at mentor.com>
---
classes/base.bbclass | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/classes/base.bbclass b/classes/base.bbclass
index afc30da..0d8630e 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
More information about the Openembedded-commits
mailing list