From: Gordon Hecker <gh@emlix.com>
Date: Wed, 27 Jan 2010 13:44:36 +0000 (+0100)
Subject: cleanup: correctly use tools module
X-Git-Tag: e2factory-2.3.4pre1~12
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=b26d40489f69bbde74aee23e3e6438cc96e63866;p=e2factory.git

cleanup: correctly use tools module

Signed-off-by: Gordon Hecker <gh@emlix.com>
---

diff --git a/generic/transport.lua b/generic/transport.lua
index d3229ae..fbcda6d 100644
--- a/generic/transport.lua
+++ b/generic/transport.lua
@@ -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'",