diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-10-07 15:31:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-11 05:39:50 +0100 |
commit | 8c695393cdcd17150d0cdbb07013ab6267428599 (patch) | |
tree | 21bc03e1ec3b4290a16fb958521eb11103c95779 | |
parent | 41286f473086ef025d075bae1bb03a2929d1bfca (diff) | |
download | poky-8c695393cdcd17150d0cdbb07013ab6267428599.tar.gz |
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): | |||
183 | def getGitCloneDirectory(self, url, branch): | 183 | def getGitCloneDirectory(self, url, branch): |
184 | """Construct unique clone directory name out of url and branch.""" | 184 | """Construct unique clone directory name out of url and branch.""" |
185 | if branch != "HEAD": | 185 | if branch != "HEAD": |
186 | return "_toaster_clones/_%s_%s" % (re.sub('[:/]', '_', url), branch) | 186 | return "_toaster_clones/_%s_%s" % (re.sub('[:/@%]', '_', url), branch) |
187 | 187 | ||
188 | # 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 |
189 | # which _ALWAYS_ means the current poky checkout | 189 | # which _ALWAYS_ means the current poky checkout |