Require the tools module where needed

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

diff --git a/generic/e2lib.lua b/generic/e2lib.lua
index 445e078b5a8f8690b96e6705aec5acbdd4e8e3be..42ee02dd27182f2903222ee246c68bf40560e2d7 100644 (file)
--- a/generic/e2lib.lua
+++ b/generic/e2lib.lua
@@ -31,7 +31,7 @@ require("buildconfig")
 local lock = require("lock")
 require("err")
 require("plugin")
-require("tools")
+local tools = require("tools")
 local cache = require("cache")
 require("luafile")
 

diff --git a/generic/generic_git.lua b/generic/generic_git.lua
index 505557b671032dc3a1326c7a5127f758d074c252..1660963672610cfa0d309287d7f0b0062ed58a72 100644 (file)
--- a/generic/generic_git.lua
+++ b/generic/generic_git.lua
@@ -31,6 +31,7 @@
 local generic_git = {}
 local cache = require("cache")
 local url = require("url")
+local tools = require("tools")
 
 --- clone a git repository
 -- @param surl url to the server

diff --git a/generic/transport.lua b/generic/transport.lua
index 1625b64c5bd761ccd993a129c275b94617826e7d..ee467bf07dad24688bb2762d7a181bf17317edd3 100644 (file)
--- a/generic/transport.lua
+++ b/generic/transport.lua
@@ -27,6 +27,7 @@
 
 local transport = {}
 local url = require("url")
+local tools = require("tools")
 
 --- call rsync with appropriate rsh argument according to the tools
 -- configuration

diff --git a/local/cvs.lua b/local/cvs.lua
index b423abf2331123bb645340da3a33903947fe39e8..5c24749603655e7e64911f79fd18abdb18954b8d 100644 (file)
--- a/local/cvs.lua
+++ b/local/cvs.lua
@@ -31,6 +31,7 @@ module("cvs", package.seeall)
 require("scm")
 local hash = require("hash")
 local url = require("url")
+local tools = require("tools")
 
 --- validate source configuration, log errors to the debug log
 -- @param info the info table

diff --git a/local/e2build.lua b/local/e2build.lua
index d108af9c6c4fda018e6360efcdf1c6b9a227dcea..c419ffbcfa1cdddd2542862f6c63ca1483493bb1 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -29,6 +29,7 @@
 
 module("e2build", package.seeall)
 local transport = require("transport")
+local tools = require("tools")
 
 --- cache a result
 -- @param info

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 66f5d2e5a0b4a4b7dfc305086fdfb3dfdca6aebc..60c0c76db40c5bace21e148d1bd4c916df878fe0 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -40,7 +40,7 @@ require("git")
 require("cvs")
 require("svn")
 require("cache")
-require("tools")
+local tools = require("tools")
 require("environment")
 require("plugin")
 local url = require("url")

diff --git a/local/svn.lua b/local/svn.lua
index a54498f05db1313081c46a81d25e8b5e4c72f871..2b38a90ed8f415a319b8ae6ec94d81e8cfc705d5 100644 (file)
--- a/local/svn.lua
+++ b/local/svn.lua
@@ -31,6 +31,7 @@ module("svn", package.seeall)
 require("scm")
 local hash = require("hash")
 local url = require("url")
+local tools = require("tools")
 
 --- translate url into subversion url
 -- @param u table: url table