Error with git+ssh repositories in Toaster

Error with git+ssh repositories in Toaster

[Stephan Dünner]

Dear Maintainer

We are using toaster sucessfully (git://git.yoctoproject.org/poky.git:  
b1f23d1254682866236bfaeb843c0d8aa332efc2)

I am facing a strange behaviour of toaster/bitbake when cloning git+ssh
repositories.
The source of the problem seems to be the "+" in the cloned foldername.

e.g. _git+ssh___bytesatwork.ch_repository

I suggest replacing the "+" with a "_" in the regex of
localhostbecontroller.py

With this fix, toaster works as suspected.


diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index b5cf559..2328edd 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

Best regards

Stephan Dünner

-- 
bytes at work
Technoparkstrasse 7
CH-8406 Winterthur
Switzerland

phone: +41 52 550 50 60
web  : http://www.bytesatwork.ch

Re: Error with git+ssh repositories in Toaster

[Ed Bartosh]

Hi Stephan,

I wasn't able to reproduce the issue on master and toaster-next.

Can you give us some details regarding 'strange behaviour' of toaster
and bitbake you're seeing?

> Dear Maintainer
>
> We are using toaster sucessfully (git://git.yoctoproject.org/poky.git:  
> b1f23d1254682866236bfaeb843c0d8aa332efc2)
>
> I am facing a strange behaviour of toaster/bitbake when cloning git+ssh
> repositories.
> The source of the problem seems to be the "+" in the cloned foldername.
>
> e.g. _git+ssh___bytesatwork.ch_repository
>
> I suggest replacing the "+" with a "_" in the regex of
> localhostbecontroller.py
>
> With this fix, toaster works as suspected.
>
>
> diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
> b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
> index b5cf559..2328edd 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
>
> Best regards
>
> Stephan Dünner
--
Regards,
Ed