Require the url module where needed

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

diff --git a/generic/cache.lua b/generic/cache.lua
index 2d84f10bd34673b169bfd3b4bf499941777666d3..85e37d24b81f2363d6641f69b465b62af8634bff 100644 (file)
--- a/generic/cache.lua
+++ b/generic/cache.lua
@@ -28,7 +28,7 @@
 local cache = {}
 require("e2lib")
 require("transport")
-require("url")
+local url = require("url")
 
 --- cache
 -- @class table

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

diff --git a/generic/transport.lua b/generic/transport.lua
index 2c95a8cc16c7ec79536e308716278126fd05e34e..51538a2d179d8b0ae2343d53e50e326054ad9e7b 100644 (file)
--- a/generic/transport.lua
+++ b/generic/transport.lua
@@ -26,6 +26,7 @@
 ]]
 
 module("transport", package.seeall)
+local url = require("url")
 
 --- call rsync with appropriate rsh argument according to the tools
 -- configuration

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

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 640df3bf6aba5c9b8962e63792eeec20fc7f7fb3..9a8ad34ba9c2b6f34e4291198a44fe4eb0a5e1ca 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -44,7 +44,7 @@ require("transport")
 require("tools")
 require("environment")
 require("plugin")
-require("url")
+local url = require("url")
 local hash = require("hash")
 require("e2util")
 require("e2option")

diff --git a/local/git.lua b/local/git.lua
index dd4e830418f211583a9686610d4611d3b964474a..9eaffd6a36759bdff7e44246bbf414cc5b5adce1 100644 (file)
--- a/local/git.lua
+++ b/local/git.lua
@@ -34,6 +34,7 @@ require("scm")
 local hash = require("hash")
 local cache = require("cache")
 local generic_git = require("generic_git")
+local url = require("url")
 
 --- git branch wrapper
 -- get the current branch

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