]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: toaster: fix cloning of git+ssh repositories
authorEd Bartosh <ed.bartosh@linux.intel.com>
Fri, 7 Oct 2016 06:23:20 +0000 (09:23 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 9 Oct 2016 11:33:26 +0000 (12:33 +0100)
Replaced '+' -> '_' to avoid having '+' in folder name.

Thanks Stephan Dünner for this fix.

(Bitbake rev: 858ade277d3bd62e84d3d78e9302f766c1b31dfb)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/toaster/bldcontrol/localhostbecontroller.py

index a64e89b93b8bbe23440d9e1a5271a0c2a4c5f546..e5f7c988c2ca42f517997e35ddb81af1af1fdddd 100644 (file)
@@ -75,7 +75,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