From 753383583c95df75339b64fe2c34669c0253057a Mon Sep 17 00:00:00 2001
From: Tobias Ulmer <tu@emlix.com>
Date: Wed, 15 Aug 2012 14:29:40 +0200
Subject: [PATCH] Require e2lib

Signed-off-by: Tobias Ulmer <tu@emlix.com>
---
 generic/cache.lua            | 2 +-
 generic/e2option.lua         | 2 +-
 generic/err.lua              | 1 +
 generic/generic_git.lua      | 1 +
 generic/lock.lua             | 1 +
 generic/plugin.lua           | 1 +
 generic/tools.lua            | 1 +
 generic/transport.lua        | 1 +
 global/e2-create-project.lua | 2 +-
 global/e2-fetch-project.lua  | 2 +-
 global/e2-install-e2.lua     | 2 +-
 global/e2.lua.in             | 2 +-
 local/build-numbers.lua      | 2 +-
 local/build.lua              | 2 +-
 local/cf.lua                 | 2 +-
 local/cvs.lua                | 1 +
 local/dlist.lua              | 2 +-
 local/dsort.lua              | 2 +-
 local/e2build.lua            | 1 +
 local/e2tool.lua             | 2 +-
 local/fetch-sources.lua      | 2 +-
 local/files.lua              | 1 +
 local/git.lua                | 1 +
 local/ls-project.lua         | 2 +-
 local/new-source.lua         | 2 +-
 local/playground.lua         | 2 +-
 local/policy.lua             | 1 +
 local/svn.lua                | 1 +
 28 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/generic/cache.lua b/generic/cache.lua
index ead3ba4..0ea6895 100644
--- a/generic/cache.lua
+++ b/generic/cache.lua
@@ -26,7 +26,7 @@
 ]]
 
 local cache = {}
-require("e2lib")
+local e2lib = require("e2lib")
 local transport = require("transport")
 local url = require("url")
 local err = require("err")
diff --git a/generic/e2option.lua b/generic/e2option.lua
index 843453f..8755109 100644
--- a/generic/e2option.lua
+++ b/generic/e2option.lua
@@ -26,7 +26,7 @@
 ]]
 
 local e2option = {}
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2util")
 local plugin = require("plugin")
 local err = require("err")
diff --git a/generic/err.lua b/generic/err.lua
index 6dd35d4..c2075ee 100644
--- a/generic/err.lua
+++ b/generic/err.lua
@@ -26,6 +26,7 @@
 ]]
 
 local err =  {}
+local e2lib = require("e2lib")
 
 --- append a string to an error object
 -- @param format string: format string
diff --git a/generic/generic_git.lua b/generic/generic_git.lua
index b226076..b18f7e6 100644
--- a/generic/generic_git.lua
+++ b/generic/generic_git.lua
@@ -33,6 +33,7 @@ local cache = require("cache")
 local url = require("url")
 local tools = require("tools")
 local err = require("err")
+local e2lib = require("e2lib")
 
 --- clone a git repository
 -- @param surl url to the server
diff --git a/generic/lock.lua b/generic/lock.lua
index c03845a..7265007 100644
--- a/generic/lock.lua
+++ b/generic/lock.lua
@@ -31,6 +31,7 @@
 -- method.
 local lock = {}
 local err = require("err")
+local e2lib = require("e2lib")
 
 --- create a new lock context
 -- @return table: the lock context
diff --git a/generic/plugin.lua b/generic/plugin.lua
index 797e1c6..df83a4b 100644
--- a/generic/plugin.lua
+++ b/generic/plugin.lua
@@ -27,6 +27,7 @@
 
 local plugin = {}
 local err = require("err")
+local e2lib = require("e2lib")
 
 --- plugin descriptor
 -- @class table
diff --git a/generic/tools.lua b/generic/tools.lua
index ffc1e69..2455cc9 100644
--- a/generic/tools.lua
+++ b/generic/tools.lua
@@ -26,6 +26,7 @@
 ]]
 
 local tools = {}
+local e2lib = require("e2lib")
 require("buildconfig")
 
 local toollist = {
diff --git a/generic/transport.lua b/generic/transport.lua
index c6ed405..2c29105 100644
--- a/generic/transport.lua
+++ b/generic/transport.lua
@@ -29,6 +29,7 @@ local transport = {}
 local url = require("url")
 local tools = require("tools")
 local err = require("err")
+local e2lib = require("e2lib")
 
 --- call rsync with appropriate rsh argument according to the tools
 -- configuration
diff --git a/global/e2-create-project.lua b/global/e2-create-project.lua
index aa60fc9..a4a9b59 100644
--- a/global/e2-create-project.lua
+++ b/global/e2-create-project.lua
@@ -26,7 +26,7 @@
 ]]
 
 require("buildconfig")
-require("e2lib")
+local e2lib = require("e2lib")
 local cache = require("cache")
 local generic_git = require("generic_git")
 local err = require("err")
diff --git a/global/e2-fetch-project.lua b/global/e2-fetch-project.lua
index 1cf308f..485e5b5 100644
--- a/global/e2-fetch-project.lua
+++ b/global/e2-fetch-project.lua
@@ -26,7 +26,7 @@
 ]]
 
 require("buildconfig")
-require("e2lib")
+local e2lib = require("e2lib")
 local e2option = require("e2option")
 local generic_git = require("generic_git")
 local cache = require("cache")
diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua
index 6af80eb..d863578 100644
--- a/global/e2-install-e2.lua
+++ b/global/e2-install-e2.lua
@@ -26,7 +26,7 @@
 ]]
 
 require("buildconfig")
-require("e2lib")
+local e2lib = require("e2lib")
 local e2option = require("e2option")
 local generic_git = require("generic_git")
 local err = require("err")
diff --git a/global/e2.lua.in b/global/e2.lua.in
index c31b6ef..957b3b1 100644
--- a/global/e2.lua.in
+++ b/global/e2.lua.in
@@ -29,7 +29,7 @@ package.path  = "@LIBDIR@/?.lua"
 package.cpath = "@LIBDIR@/?.so"
 
 require("buildconfig")
-require("e2lib")
+local e2lib = require("e2lib")
 local e2option = require("e2option")
 require("e2util")
 
diff --git a/local/build-numbers.lua b/local/build-numbers.lua
index 65c1999..00b6e07 100644
--- a/local/build-numbers.lua
+++ b/local/build-numbers.lua
@@ -27,7 +27,7 @@
 
 -- e2-buildnumbers -*- Lua -*-
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 local e2option = require("e2option")
 
diff --git a/local/build.lua b/local/build.lua
index 6d2d372..ff97d45 100644
--- a/local/build.lua
+++ b/local/build.lua
@@ -27,7 +27,7 @@
 
 -- e2-build -*- Lua -*-
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 require("e2build")
 local err = require("err")
diff --git a/local/cf.lua b/local/cf.lua
index b2ee066..fcb362d 100644
--- a/local/cf.lua
+++ b/local/cf.lua
@@ -27,7 +27,7 @@
 
 -- e2-cf -*- Lua -*-
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 local err = require("err")
 local e2option = require("e2option")
diff --git a/local/cvs.lua b/local/cvs.lua
index 36d5698..3f620f3 100644
--- a/local/cvs.lua
+++ b/local/cvs.lua
@@ -33,6 +33,7 @@ local hash = require("hash")
 local url = require("url")
 local tools = require("tools")
 local err = require("err")
+local e2lib = require("e2lib")
 
 --- validate source configuration, log errors to the debug log
 -- @param info the info table
diff --git a/local/dlist.lua b/local/dlist.lua
index a6723dd..570b933 100644
--- a/local/dlist.lua
+++ b/local/dlist.lua
@@ -27,7 +27,7 @@
 
 -- dlist - list sorted dependencies -*- Lua -*-
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 require("e2build")
 local e2option = require("e2option")
diff --git a/local/dsort.lua b/local/dsort.lua
index df1b96a..c8da13f 100644
--- a/local/dsort.lua
+++ b/local/dsort.lua
@@ -27,7 +27,7 @@
 
 -- dsort -*- Lua -*-
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 require("e2build")
 local e2option = require("e2option")
diff --git a/local/e2build.lua b/local/e2build.lua
index 8a60a36..53c9ddc 100644
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -31,6 +31,7 @@ module("e2build", package.seeall)
 local transport = require("transport")
 local tools = require("tools")
 local err = require("err")
+local e2lib = require("e2lib")
 
 --- cache a result
 -- @param info
diff --git a/local/e2tool.lua b/local/e2tool.lua
index 03d1583..35099a1 100644
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -30,7 +30,7 @@
 -- High-level tools used by the build process and basic build operations.
 
 module("e2tool", package.seeall)
-require("e2lib")
+local e2lib = require("e2lib")
 require("strict")
 local err = require("err")
 require("scm")
diff --git a/local/fetch-sources.lua b/local/fetch-sources.lua
index 60a7c6f..3d5fbed 100644
--- a/local/fetch-sources.lua
+++ b/local/fetch-sources.lua
@@ -27,7 +27,7 @@
 
 -- fetch-sources - Retrieve sources for project -*- Lua -*-
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 require("e2build")
 local err = require("err")
diff --git a/local/files.lua b/local/files.lua
index eb13dbd..d282048 100644
--- a/local/files.lua
+++ b/local/files.lua
@@ -33,6 +33,7 @@ module("files", package.seeall)
 require("scm")
 local hash = require("hash")
 local err = require("err")
+local e2lib = require("e2lib")
 
 --- validate source configuration, log errors to the debug log
 -- @param info the info table
diff --git a/local/git.lua b/local/git.lua
index eafac22..7b5dc3b 100644
--- a/local/git.lua
+++ b/local/git.lua
@@ -37,6 +37,7 @@ local generic_git = require("generic_git")
 local url = require("url")
 local err = require("err")
 local e2option = require("e2option")
+local e2lib = require("e2lib")
 
 --- git branch wrapper
 -- get the current branch
diff --git a/local/ls-project.lua b/local/ls-project.lua
index ef34772..4659580 100644
--- a/local/ls-project.lua
+++ b/local/ls-project.lua
@@ -27,7 +27,7 @@
 
 -- ls-project - show project information -*- Lua -*-
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 local err = require("err")
 local e2option = require("e2option")
diff --git a/local/new-source.lua b/local/new-source.lua
index 6a19793..3c01e78 100644
--- a/local/new-source.lua
+++ b/local/new-source.lua
@@ -28,7 +28,7 @@
 -- e2-new-source - add new source onto an existing server -*- Lua -*-
 
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 local generic_git = require("generic_git")
 local cache = require("cache")
diff --git a/local/playground.lua b/local/playground.lua
index 27dcb76..96cb94a 100644
--- a/local/playground.lua
+++ b/local/playground.lua
@@ -27,7 +27,7 @@
 
 -- playground - enter existing chroot(1) environment -*- Lua -*-
 
-require("e2lib")
+local e2lib = require("e2lib")
 require("e2tool")
 require("e2build")
 local err = require("err")
diff --git a/local/policy.lua b/local/policy.lua
index e0c8e68..f7541bd 100644
--- a/local/policy.lua
+++ b/local/policy.lua
@@ -28,6 +28,7 @@
 module("policy", package.seeall)
 local err = require("err")
 local e2option = require("e2option")
+local e2lib = require("e2lib")
 
 function source_set_lazytag()
 	return "lazytag"
diff --git a/local/svn.lua b/local/svn.lua
index c95bd93..88bdc6b 100644
--- a/local/svn.lua
+++ b/local/svn.lua
@@ -33,6 +33,7 @@ local hash = require("hash")
 local url = require("url")
 local tools = require("tools")
 local err = require("err")
+local e2lib = require("e2lib")
 
 --- translate url into subversion url
 -- @param u table: url table
-- 
2.39.5