Require e2option

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

diff --git a/global/e2-create-project.lua b/global/e2-create-project.lua
index 61550ef57f9c62029596e7262c875fab5f0891c5..aa60fc9e8f56d11f67a5816245a9d95ee1bec60f 100644 (file)
--- a/global/e2-create-project.lua
+++ b/global/e2-create-project.lua
@@ -27,10 +27,10 @@
 
 require("buildconfig")
 require("e2lib")
-require("e2option")
 local cache = require("cache")
 local generic_git = require("generic_git")
 local err = require("err")
+local e2option = require("e2option")
 
 e2lib.init()
 

diff --git a/global/e2-fetch-project.lua b/global/e2-fetch-project.lua
index 01b75106eca83a1020826c9e764eee86e7ff5f41..1cf308f63c4a47d2e2f187b5cb30d79248bde32f 100644 (file)
--- a/global/e2-fetch-project.lua
+++ b/global/e2-fetch-project.lua
@@ -27,7 +27,7 @@
 
 require("buildconfig")
 require("e2lib")
-require("e2option")
+local e2option = require("e2option")
 local generic_git = require("generic_git")
 local cache = require("cache")
 local err = require("err")

diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua
index 3f0df8c45efc91250dc71a48b4973770b24f4cb0..6af80ebcfbb11ceca9b8872b26aec177182f5ab0 100644 (file)
--- a/global/e2-install-e2.lua
+++ b/global/e2-install-e2.lua
@@ -27,7 +27,7 @@
 
 require("buildconfig")
 require("e2lib")
-require("e2option")
+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 5228eacc5893ddcdd77d8c93b28a685b179eb515..c31b6ef778202b7724bc18595c9c15d52f5a16e4 100644 (file)
--- a/global/e2.lua.in
+++ b/global/e2.lua.in
@@ -30,7 +30,7 @@ package.cpath = "@LIBDIR@/?.so"
 
 require("buildconfig")
 require("e2lib")
-require("e2option")
+local e2option = require("e2option")
 require("e2util")
 
 e2lib.init()

diff --git a/local/build-numbers.lua b/local/build-numbers.lua
index 6cf404f5027d531498a4f3ad2211b97d58fe1593..65c19991791c2ef566b2fffd380d732b957637b6 100644 (file)
--- a/local/build-numbers.lua
+++ b/local/build-numbers.lua
@@ -29,6 +29,8 @@
 
 require("e2lib")
 require("e2tool")
+local e2option = require("e2option")
+
 e2lib.init()
 local info, re = e2tool.local_init(nil, "build-numbers")
 if not info then

diff --git a/local/build.lua b/local/build.lua
index e61f6b2f0de9b55824feaecc8bbe78c295471831..6d2d372e45d23b275ba448e3eff235d3da2a8300 100644 (file)
--- a/local/build.lua
+++ b/local/build.lua
@@ -31,6 +31,7 @@ require("e2lib")
 require("e2tool")
 require("e2build")
 local err = require("err")
+local e2option = require("e2option")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "build")

diff --git a/local/cf.lua b/local/cf.lua
index c197ea9a2326d16e790e4b7d25431959d4c009fa..b2ee066c27ceacd2b2ce46013e523a66a744c57e 100644 (file)
--- a/local/cf.lua
+++ b/local/cf.lua
@@ -30,6 +30,7 @@
 require("e2lib")
 require("e2tool")
 local err = require("err")
+local e2option = require("e2option")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "cf")

diff --git a/local/dlist.lua b/local/dlist.lua
index d7935db2bd36eb183ff104e123db839ebe780f81..a6723dd5bb590b47cd988a4ee987c38b71669ce2 100644 (file)
--- a/local/dlist.lua
+++ b/local/dlist.lua
@@ -30,6 +30,8 @@
 require("e2lib")
 require("e2tool")
 require("e2build")
+local e2option = require("e2option")
+
 e2lib.init()
 local info, re = e2tool.local_init(nil, "dlist")
 if not info then

diff --git a/local/dsort.lua b/local/dsort.lua
index 97e8ce1774bd638dff663b1dc7f9b242d4c41373..df1b96afc0f2c27f922e2511136c65aff156eaa9 100644 (file)
--- a/local/dsort.lua
+++ b/local/dsort.lua
@@ -30,6 +30,8 @@
 require("e2lib")
 require("e2tool")
 require("e2build")
+local e2option = require("e2option")
+
 e2lib.init()
 local info, re = e2tool.local_init(nil, "dsort")
 if not info then

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 43aaa0869e0aea10cd2d5a558ba4aa3648ce452d..03d1583f9bc7d929fd4f82c742ff22f2756fa5e6 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -45,7 +45,7 @@ local plugin = require("plugin")
 local url = require("url")
 local hash = require("hash")
 require("e2util")
-require("e2option")
+local e2option = require("e2option")
 local generic_git = require("generic_git")
 require("policy")
 

diff --git a/local/fetch-sources.lua b/local/fetch-sources.lua
index 7f1cf4214d16adf8b959e688827b8737e61db730..60a7c6f55e243a2190edacd994e30d7d421fb291 100644 (file)
--- a/local/fetch-sources.lua
+++ b/local/fetch-sources.lua
@@ -31,6 +31,7 @@ require("e2lib")
 require("e2tool")
 require("e2build")
 local err = require("err")
+local e2option = require("e2option")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "fetch-sources")

diff --git a/local/git.lua b/local/git.lua
index 1d3e6e2d6e91e9f5c82adc7b46726f0749ffcf1e..eafac222b9d2409874dc8e4a6bbeffceff7eb083 100644 (file)
--- a/local/git.lua
+++ b/local/git.lua
@@ -36,6 +36,7 @@ local cache = require("cache")
 local generic_git = require("generic_git")
 local url = require("url")
 local err = require("err")
+local e2option = require("e2option")
 
 --- git branch wrapper
 -- get the current branch

diff --git a/local/ls-project.lua b/local/ls-project.lua
index 104e4208ba9e53dd2bd7ed3f5b0f735d338b5ab8..ef34772d74ffa870166455030ec1b600bd7cff57 100644 (file)
--- a/local/ls-project.lua
+++ b/local/ls-project.lua
@@ -30,6 +30,7 @@
 require("e2lib")
 require("e2tool")
 local err = require("err")
+local e2option = require("e2option")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "ls-project")

diff --git a/local/new-source.lua b/local/new-source.lua
index d9bb3baa34a84fcec9a2680ed6713327095acb5c..6a19793f41717f3e6b5caa8c903bf43919201a4c 100644 (file)
--- a/local/new-source.lua
+++ b/local/new-source.lua
@@ -33,6 +33,7 @@ require("e2tool")
 local generic_git = require("generic_git")
 local cache = require("cache")
 local err = require("err")
+local e2option = require("e2option")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "new-source")

diff --git a/local/playground.lua b/local/playground.lua
index 4b5393a99c5f7f99b70813abdd098bc5fd60ff57..27dcb76d136ab9d9ad036c2c94cd5246906b2638 100644 (file)
--- a/local/playground.lua
+++ b/local/playground.lua
@@ -31,6 +31,7 @@ require("e2lib")
 require("e2tool")
 require("e2build")
 local err = require("err")
+local e2option = require("e2option")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "playground")

diff --git a/local/policy.lua b/local/policy.lua
index 7a7b876534845de3cef9a8f7bd9918216049fb07..e0c8e6840ab9d1bec557b0e2f1a6f73b6610a8a8 100644 (file)
--- a/local/policy.lua
+++ b/local/policy.lua
@@ -27,6 +27,7 @@
 
 module("policy", package.seeall)
 local err = require("err")
+local e2option = require("e2option")
 
 function source_set_lazytag()
        return "lazytag"