From 8c695393cdcd17150d0cdbb07013ab6267428599 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 7 Oct 2015 15:31:20 +0100 Subject: bitbake: toaster: fix naming for clone directory Toaster uses git url and branch to make a clone directory name. Current code leaves '@' and '%' characters unchanged, which can cause generation of wrong directory names. Fixed this issue by replacing '@' and '%' with underscore. (Bitbake rev: e076888a2120a37c388930073694750735d86507) Signed-off-by: Ed Bartosh Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index a8d83986fe..3ee68ae47a 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -183,7 +183,7 @@ class LocalhostBEController(BuildEnvironmentController): def getGitCloneDirectory(self, url, branch): """Construct unique clone directory name out of url and branch.""" if branch != "HEAD": - return "_toaster_clones/_%s_%s" % (re.sub('[:/]', '_', url), branch) + return "_toaster_clones/_%s_%s" % (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 -- cgit v1.2.3-54-g00ecf