From: Tobias Ulmer <tu@emlix.com>
Date: Fri, 6 Dec 2013 14:20:02 +0000 (+0100)
Subject: git: cosmetic cleanup
X-Git-Tag: e2factory-2.3.15rc1~294
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=bab66bed3409f3cbb039d525c29e898564a5c5ff;p=e2factory.git

git: cosmetic cleanup

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---

diff --git a/plugins/git.lua b/plugins/git.lua
index d3d09d9..ba2fe99 100644
--- a/plugins/git.lua
+++ b/plugins/git.lua
@@ -425,7 +425,7 @@ function git.working_copy_available(info, sourcename)
     if not rc then
         return false, e:cat(re)
     end
-    local gitwc = info.root .. "/" .. src.working
+    local gitwc = e2lib.join(info.root, src.working)
     local rc = e2lib.isdir(gitwc)
     return rc, nil
 end
@@ -564,7 +564,7 @@ function git.toresult(info, sourcename, sourceset, directory)
     local src = info.sources[sourcename]
     local makefile = "Makefile"
     local source = "source"
-    local sourcedir = string.format("%s/%s", directory, source)
+    local sourcedir = e2lib.join(directory, source)
     local archive = string.format("%s.tar.gz", src.name)
     local cmd = nil
 
@@ -626,7 +626,7 @@ function git.toresult(info, sourcename, sourceset, directory)
         return false, e:append("sourceset not supported: %s",
         sourceset)
     end
-    local fname  = string.format("%s/%s", directory, makefile)
+    local fname  = e2lib.join(directory, makefile)
     local out = string.format(
         ".PHONY:\tplace\n\n"..
         "place:\n"..
@@ -636,7 +636,7 @@ function git.toresult(info, sourcename, sourceset, directory)
         return false, e:cat(re)
     end
     -- write licences
-    local destdir = string.format("%s/licences", directory)
+    local destdir = e2lib.join(directory, "licences")
     local fname = string.format("%s/%s.licences", destdir, archive)
     local licence_list = table.concat(src.licences, "\n") .. "\n"
     rc, re = e2lib.mkdir_recursive(destdir)