From: Tobias Ulmer <tu@emlix.com>
Date: Tue, 7 Aug 2012 10:03:17 +0000 (+0200)
Subject: Require the url module where needed
X-Git-Tag: e2factory-2.3.13rc1~196
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=2a859110d92628f215c8f8d146853d7dc2ff9aa5;p=e2factory.git

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 2d84f10..85e37d2 100644
--- 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 5ab427a..505557b 100644
--- 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 2c95a8c..51538a2 100644
--- 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 498e8bb..b423abf 100644
--- 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 640df3b..9a8ad34 100644
--- 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 dd4e830..9eaffd6 100644
--- 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 31bd3f3..a54498f 100644
--- 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