From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Date: Wed, 17 Nov 2010 14:04:42 +0000 (+0100)
Subject: fetch: use os.path.join
X-Git-Tag: 2011-1~3126
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b7d667f25283cddf8ff4fc9e35425a884a9f527e;p=openembedded-core.git

fetch: use os.path.join

(Bitbake rev: c360b01df18d90a513a3d61d395f905102e7568e)

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py
index c9c8bdb893..18775301a3 100644
--- a/bitbake/lib/bb/fetch/__init__.py
+++ b/bitbake/lib/bb/fetch/__init__.py
@@ -136,7 +136,7 @@ def uri_replace(uri, uri_find, uri_replace, d):
                     if d:
                         localfn = bb.fetch.localpath(uri, d)
                         if localfn:
-                            result_decoded[loc] = os.path.dirname(result_decoded[loc]) + "/" + os.path.basename(bb.fetch.localpath(uri, d))
+                            result_decoded[loc] = os.path.join(os.path.dirname(result_decoded[loc]), os.path.basename(bb.fetch.localpath(uri, d)))
             else:
                 return uri
     return encodeurl(result_decoded)