From: Tobias Ulmer <tu@emlix.com>
Date: Mon, 13 Aug 2012 10:20:07 +0000 (+0200)
Subject: Require e2option
X-Git-Tag: e2factory-2.3.13rc1~170
X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=405ce503b3f0485856df02877f0aa6e9d9474c42;p=e2factory.git

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 61550ef..aa60fc9 100644
--- 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 01b7510..1cf308f 100644
--- 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 3f0df8c..6af80eb 100644
--- 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 5228eac..c31b6ef 100644
--- 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 6cf404f..65c1999 100644
--- 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 e61f6b2..6d2d372 100644
--- 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 c197ea9..b2ee066 100644
--- 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 d7935db..a6723dd 100644
--- 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 97e8ce1..df1b96a 100644
--- 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 43aaa08..03d1583 100644
--- 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 7f1cf42..60a7c6f 100644
--- 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 1d3e6e2..eafac22 100644
--- 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 104e420..ef34772 100644
--- 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 d9bb3ba..6a19793 100644
--- 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 4b5393a..27dcb76 100644
--- 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 7a7b876..e0c8e68 100644
--- 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"