summaryrefslogtreecommitdiffstats
path: root/bitbake
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:11 +0100
commit4c8b3e10f798ff4ac192fbdab92c1e8d5d02d2e0 (patch)
treefe96eda0b186fffc9f3da55f0203535d19a45d21 /bitbake
parent63ee4133b8eef9f31bc64fe24ca92a70a83e4fbb (diff)
downloadast2050-yocto-poky-4c8b3e10f798ff4ac192fbdab92c1e8d5d02d2e0.zip
ast2050-yocto-poky-4c8b3e10f798ff4ac192fbdab92c1e8d5d02d2e0.tar.gz
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: 7110055ab26d40e2a4e83956177b59a58e9cdcfd) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-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 44fc271..0fd9bee 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -246,7 +246,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/"
OpenPOWER on IntegriCloud