diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-08-30 16:43:31 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-08-30 16:43:32 -0700 |
| commit | 599b03fe999d41114d124ce663b6c59fa57256d8 (patch) | |
| tree | ff1c067cb3c0e1d26d42f093a4420683763bae5b /classes/base.bbclass | |
| parent | 7ec84b10a33241350d53efe50b7ca31bdecb2204 (diff) | |
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@mentor.com>
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
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 |