summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Darander <anders@chargestorm.se>2015-04-17 05:49:42 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-24 10:33:15 (GMT)
commite625a82af2d7cfb04a0a895d2a395c02676f3680 (patch)
treef2879cda683452f614cb2ef9fbbd104fa106f1b9
parentefde5a130397c597e6464a4e547774b6e600abfa (diff)
downloadpoky-e625a82af2d7cfb04a0a895d2a395c02676f3680.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: fad3ea40ebaf2cdcb981fb38bd755015e50fc9a5) 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 9ca2442..5d1a358 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -245,7 +245,7 @@ class Git(FetchMethod):
245 subdir = ud.parm.get("subpath", "") 245 subdir = ud.parm.get("subpath", "")
246 if subdir != "": 246 if subdir != "":
247 readpathspec = ":%s" % (subdir) 247 readpathspec = ":%s" % (subdir)
248 def_destsuffix = "%s/" % os.path.basename(subdir) 248 def_destsuffix = "%s/" % os.path.basename(subdir.rstrip('/'))
249 else: 249 else:
250 readpathspec = "" 250 readpathspec = ""
251 def_destsuffix = "git/" 251 def_destsuffix = "git/"