From: Ed Bartosh Date: Wed, 7 Oct 2015 14:31:20 +0000 (+0100) Subject: toaster: fix naming for clone directory X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e076888a2120a37c388930073694750735d86507;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Ed Bartosh Signed-off-by: Elliot Smith Signed-off-by: Richard Purdie --- diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index a8d83986fe8..3ee68ae47a9 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/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