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