]> git.e2factory.org Git - e2factory.git/commitdiff
cleanup: correctly use tools module
authorGordon Hecker <gh@emlix.com>
Wed, 27 Jan 2010 13:44:36 +0000 (14:44 +0100)
committerGordon Hecker <gh@emlix.com>
Fri, 12 Feb 2010 09:52:00 +0000 (10:52 +0100)
Signed-off-by: Gordon Hecker <gh@emlix.com>
generic/transport.lua

index d3229ae1de7d5906f9e6d0bc826e9005bdc576d6..fbcda6dfdd3e33f32e69ea19c72ccf9b510a289f 100644 (file)
@@ -74,8 +74,8 @@ function fetch_file(surl, location, destdir, destname)
                        user = ""
                end
                -- rsync --rsh="ssh" "server:sourcefile" "destdir/destfile"
-               local rsh = string.format("%s %s", tools.ssh.name,
-                                                       tools.ssh.flags)
+               local rsh = string.format("%s %s", tools.get_tool("ssh"),
+                                               tools.get_tool_flags("ssh"))
                local args = string.format(
                                "--rsh=\"%s\" '%s%s:/%s/%s' '%s/%s'",
                                rsh, user, u.servername, u.path, location,
@@ -221,8 +221,8 @@ function push_file(sourcefile, durl, location, push_permissions, try_hardlink)
                        return false, re
                end
                e2lib.rmtempfile(tmp)
-               local rsh = string.format("%s %s", tools.ssh.name,
-                                                       tools.ssh.flags)
+               local rsh = string.format("%s %s", tools.get_tool("ssh"),
+                                               tools.get_tool_flags("ssh"))
                -- rsync --rsh="ssh" "sourcefile" "destfile"
                local args = string.format(
                                "%s --rsh='%s' '%s' '%s%s:/%s/%s'",