[bitbake-devel] [PATCH 2/3] fetch2/git: _revision_key: collapse adjacent slashes
Chris Laplante
chris.laplante at agilent.com
Thu Jan 16 16:28:04 UTC 2020
>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"
Signed-off-by: Chris Laplante <chris.laplante at agilent.com>
---
lib/bb/fetch2/git.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py
index fa41b07..9ba9cdc 100644
--- a/lib/bb/fetch2/git.py
+++ b/lib/bb/fetch2/git.py
@@ -594,7 +594,9 @@ class Git(FetchMethod):
"""
Return a unique key for the url
"""
- return "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name]
+ # Collapse adjacent slashes
+ slash_re = re.compile(r"/+")
+ return "git:" + ud.host + slash_re.sub(".", ud.path) + ud.unresolvedrev[name]
def _lsremote(self, ud, d, search):
"""
--
2.7.4
More information about the bitbake-devel
mailing list