summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/toaster/bldcontrol/localhostbecontroller.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index ebb43772..8c4e9c7e 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -181,14 +181,9 @@ class LocalhostBEController(BuildEnvironmentController):
logger.debug("localhostbecontroller: Stopped bitbake server")
def getGitCloneDirectory(self, url, branch):
- """ Utility that returns the last component of a git path as directory
- """
- components = re.split(r'[:\.\/]', url)
- base = components[-2] if components[-1] == "git" else components[-1]
-
+ """Construct unique clone directory name out of url and branch."""
if branch != "HEAD":
- return "_%s_%s.toaster_cloned" % (base, branch)
-
+ return "_%s_%s.toaster_cloned" % (re.sub('[:/]', '_', url), branch)
# word of attention; this is a localhost-specific issue; only on the localhost we expect to have "HEAD" releases
# which _ALWAYS_ means the current poky checkout