summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2015-04-17 07:49:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-24 11:33:13 +0100
commit46f73593c03532b7293fde3147231422ac991081 (patch)
tree790f524f0495d499ec1493cc6b518bbd5f352e71
parentf460fd853b79efe7b29297ef597d6241b19eb70d (diff)
downloadpoky-46f73593c03532b7293fde3147231422ac991081.tar.gz
poky-46f73593c03532b7293fde3147231422ac991081.tar.bz2
poky-46f73593c03532b7293fde3147231422ac991081.zip
bitbake: fetch/git: Remove a possible trailing '/' in subpath
If the subpath parameter to the git fetcher ends with a trailing '/', bb.utils.prunedir() will be called on '/'... Fixes [YOCTO #7620]. (Bitbake master rev: 380a3fb372c8b0a53dd7528562e6e7a222dc76ef) (Bitbake rev: faffa1c4a4d8353b21a0d359076153da0dc31a05) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 66a77a8376..5573f0a81e 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -245,7 +245,7 @@ class Git(FetchMethod):
subdir = ud.parm.get("subpath", "")
if subdir != "":
readpathspec = ":%s" % (subdir)
- def_destsuffix = "%s/" % os.path.basename(subdir)
+ def_destsuffix = "%s/" % os.path.basename(subdir.rstrip('/'))
else:
readpathspec = ""
def_destsuffix = "git/"