summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorChris Laplante <chris.laplante@agilent.com>2020-01-16 11:28:04 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-11 23:02:13 +0000
commitee1dd9f1e2630d100776c436badc97902d224082 (patch)
tree46fa214cf4bd64862473e729d5de3581fc80e16d /bitbake/lib
parent2edae751cfeb6cf71c17edeaba6f5d265c9005b9 (diff)
downloadpoky-ee1dd9f1e2630d100776c436badc97902d224082.tar.gz
bitbake: fetch2/git: _revision_key: collapse adjacent slashes
>From a SRCREV caching point of view, there is no reason to treat the following upstreams as different: SRC_URI = "git://github.com/file/file.git" SRC_URI = "git://github.com//file/file.git" (Bitbake rev: 716cdf737bc536f84ed1254d464c9f286e0d5a9a) Signed-off-by: Chris Laplante <chris.laplante@agilent.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 425e21c14955dd38868c6e97637df3bbe0f89fac) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/fetch2/git.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index fa41b078f1..9ba9cdccc7 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -594,7 +594,9 @@ class Git(FetchMethod):
594 """ 594 """
595 Return a unique key for the url 595 Return a unique key for the url
596 """ 596 """
597 return "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name] 597 # Collapse adjacent slashes
598 slash_re = re.compile(r"/+")
599 return "git:" + ud.host + slash_re.sub(".", ud.path) + ud.unresolvedrev[name]
598 600
599 def _lsremote(self, ud, d, search): 601 def _lsremote(self, ud, d, search):
600 """ 602 """