summaryrefslogtreecommitdiffstats
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-01-19 13:31:05 +0000
commit96adf215cca17bc1fed40de635139b3422ba6fde (patch)
tree353cef345ec7d8b6d940e86ed75a47b8143630ac
parent065ab5dce0e8415c3d8c8d4e85e68ea8e9c0347f (diff)
downloadpoky-96adf215cca17bc1fed40de635139b3422ba6fde.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: 425e21c14955dd38868c6e97637df3bbe0f89fac) Signed-off-by: Chris Laplante <chris.laplante@agilent.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 fe0a384af2..5b3793a705 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 """