[review-request][PATCH] toaster: fix naming for clone directory (ed/toaster/fix-directory-name)

[review-request][PATCH] toaster: fix naming for clone directory (ed/toaster/fix-directory-name)

[Ed Bartosh]

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 <ed.bartosh@linux.intel.com>
---
 bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index a8d8398..3ee68ae 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
--
Ed

Re: [review-request][PATCH] toaster: fix naming for clone directory (ed/toaster/fix-directory-name)

[Smith, Elliot]

[-- Attachment #1: Type: text/plain, Size: 1724 bytes --]

On 7 October 2015 at 15:21, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:

> 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.
>

Submitted upstream.

Elliot


>
> Fixed this issue by replacing '@' and '%' with underscore.
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
>  bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
> b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
> index a8d8398..3ee68ae 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
> --
> Ed
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>



-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre

[-- Attachment #2: Type: text/html, Size: 2758 bytes --]