summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
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-17 11:52:18 +0100
commit65e985976989c30a94d6e78c8cb348af93fa0878 (patch)
tree7a12ec2f9656d5b59fae86b9bf9da1421e083cab /bitbake/lib
parent3c0664b687511b5cd88a78ccfc7881adf5227e8f (diff)
downloadpoky-65e985976989c30a94d6e78c8cb348af93fa0878.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 rev: 380a3fb372c8b0a53dd7528562e6e7a222dc76ef) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-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 44fc27193e..0fd9beee19 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -246,7 +246,7 @@ class Git(FetchMethod):
246 subdir = ud.parm.get("subpath", "") 246 subdir = ud.parm.get("subpath", "")
247 if subdir != "": 247 if subdir != "":
248 readpathspec = ":%s" % (subdir) 248 readpathspec = ":%s" % (subdir)
249 def_destsuffix = "%s/" % os.path.basename(subdir) 249 def_destsuffix = "%s/" % os.path.basename(subdir.rstrip('/'))
250 else: 250 else:
251 readpathspec = "" 251 readpathspec = ""
252 def_destsuffix = "git/" 252 def_destsuffix = "git/"