From 4389c4cdec3102839e0bac08adb35b7a1eee9ceb Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Tue, 7 Aug 2012 14:18:40 +0200 Subject: [PATCH] Require the tools module where needed Signed-off-by: Tobias Ulmer --- generic/e2lib.lua | 2 +- generic/generic_git.lua | 1 + generic/transport.lua | 1 + local/cvs.lua | 1 + local/e2build.lua | 1 + local/e2tool.lua | 2 +- local/svn.lua | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/generic/e2lib.lua b/generic/e2lib.lua index 445e078..42ee02d 100644 --- 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 505557b..1660963 100644 --- 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 1625b64..ee467bf 100644 --- 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 b423abf..5c24749 100644 --- 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 d108af9..c419ffb 100644 --- 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 66f5d2e..60c0c76 100644 --- 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 a54498f..2b38a90 100644 --- 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 -- 2.39.5