Require e2lib

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

diff --git a/generic/cache.lua b/generic/cache.lua
index ead3ba4fd38f0dbbfc88467f64b0ab348adabb14..0ea6895dd52d733c58882b4330b06d8ff030e1d4 100644 (file)
--- 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 843453f2c00181d92387417377d04dd10f1f0bf7..875510969969ffb4fd2e882775d058906829144b 100644 (file)
--- 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 6dd35d4dc2fc395cff889b56ea2f8c40f136b72b..c2075eec59cc3e4a065935a77568b1c874e3940b 100644 (file)
--- 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 b226076d5608fec3ba55334c1a39d1b9d987e3e9..b18f7e68075e2212b3ac9299205a03c1a68b5ef7 100644 (file)
--- 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 c03845a62aceb908326fe2ca1654e834f6d25d5d..726500754c6203f21cc8627b73e03985597f1f19 100644 (file)
--- 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 797e1c66a88ff284b052113f34dee2370d40a963..df83a4bab09e5babc969fb0bc05723d196943cd8 100644 (file)
--- 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 ffc1e6979a17e06e108d977d5aa55a9c123c56cd..2455cc977945584bc8aa9826b36e9768ea089f5f 100644 (file)
--- 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 c6ed4058b6ca073f55ed72c750a33002ad1620bb..2c2910580fb10f7e9da94e0efc32f73c449c113d 100644 (file)
--- 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 aa60fc9e8f56d11f67a5816245a9d95ee1bec60f..a4a9b59f679520d5b07ffc4f4713a02c73875623 100644 (file)
--- 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 1cf308f63c4a47d2e2f187b5cb30d79248bde32f..485e5b592ac45ab9492c9bc1834de963e0ef315c 100644 (file)
--- 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 6af80ebcfbb11ceca9b8872b26aec177182f5ab0..d86357818327edf992bca347740caae4df56a9c7 100644 (file)
--- 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 c31b6ef778202b7724bc18595c9c15d52f5a16e4..957b3b1da9518fb15db5d4b39f24455beba5ffa7 100644 (file)
--- 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 65c19991791c2ef566b2fffd380d732b957637b6..00b6e07d8cdb79466c4668f551b5c72469e7fe99 100644 (file)
--- 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 6d2d372e45d23b275ba448e3eff235d3da2a8300..ff97d4532e275b653b1585231cd926f534eb9968 100644 (file)
--- 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 b2ee066c27ceacd2b2ce46013e523a66a744c57e..fcb362df9afb77ccc38939de54832f9f3538be09 100644 (file)
--- 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 36d56981215c06de22ce7d0b62c24f0f10ed15d6..3f620f35265ba6eeabb90e8ce55d140bc4c6f1da 100644 (file)
--- 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 a6723dd5bb590b47cd988a4ee987c38b71669ce2..570b933eb805e4f610596b2c50ce70277e89a0e4 100644 (file)
--- 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 df1b96afc0f2c27f922e2511136c65aff156eaa9..c8da13f18e1ffb2abcad17b969b3cc78417c1f9a 100644 (file)
--- 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 8a60a36bda30aaf0b038ac592d17a8e89e3f0c03..53c9ddc42c48080329493aca96c3721d95b1e51e 100644 (file)
--- 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 03d1583f9bc7d929fd4f82c742ff22f2756fa5e6..35099a1145a95dabc08c01a752d3c30448308f5d 100644 (file)
--- 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 60a7c6f55e243a2190edacd994e30d7d421fb291..3d5fbed9a6c9920558f4732b5991fe3a0ba42277 100644 (file)
--- 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 eb13dbd7f7b70ee0c15b3e963026c565fece5cca..d28204879cf544cb360964d74725cedaa0c1b42a 100644 (file)
--- 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 eafac222b9d2409874dc8e4a6bbeffceff7eb083..7b5dc3b1d4268da9ac6f561e102f17ef2befd8c1 100644 (file)
--- 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 ef34772d74ffa870166455030ec1b600bd7cff57..465958091af9dea72f4858f195e04edaffbecf9b 100644 (file)
--- 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 6a19793f41717f3e6b5caa8c903bf43919201a4c..3c01e787785799b5c5f9319a1329c9d1f8f9e5b5 100644 (file)
--- 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 27dcb76d136ab9d9ad036c2c94cd5246906b2638..96cb94aa43fb6403f44cb5dcefc264ce00159994 100644 (file)
--- 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 e0c8e6840ab9d1bec557b0e2f1a6f73b6610a8a8..f7541bda20c2a631428ec65f8c042b9471210a43 100644 (file)
--- 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 c95bd93b342abc3c8fffbc1f562ff190905efb8d..88bdc6b7f0490d2f6715047eb963b1d380846339 100644 (file)
--- 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