Require policy module and adapt usage

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

diff --git a/local/e2-build-numbers.lua b/local/e2-build-numbers.lua
index 16f50a3a2aba749a1842ce500b4c6f6bb56ad1dd..a8829d5a7592ed5a0495a20d0ed2cbbe63baf858 100644 (file)
--- a/local/e2-build-numbers.lua
+++ b/local/e2-build-numbers.lua
@@ -28,6 +28,7 @@
 local e2lib = require("e2lib")
 require("e2tool")
 local e2option = require("e2option")
+local policy = require("policy")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "build-numbers")

diff --git a/local/e2-build.lua b/local/e2-build.lua
index f244beda2e3c6ee43a53fffedd0178a388d17036..bee29f7fe95f43bb26660eab8ceb5baa4ef1a59a 100644 (file)
--- a/local/e2-build.lua
+++ b/local/e2-build.lua
@@ -31,6 +31,7 @@ local e2build = require("e2build")
 local err = require("err")
 local e2option = require("e2option")
 local scm = require("scm")
+local policy = require("policy")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "build")
@@ -134,10 +135,10 @@ if opts["branch-mode"] and opts["wc-mode"] then
 end
 if opts["branch-mode"] then
     -- selected results get a special build mode
-    build_mode = policy.default_build_mode["branch"]
+    build_mode = policy.default_build_mode("branch")
 end
 if opts["wc-mode"] then
-    build_mode = policy.default_build_mode["working-copy"]
+    build_mode = policy.default_build_mode("working-copy")
 end
 local playground = opts["playground"]
 if playground then

diff --git a/local/e2-ls-project.lua b/local/e2-ls-project.lua
index 1ce9d4c90dabf3b6fc07dd1cd397af549099cf42..2f49f54629f80821c7aa7462a47128e0506eda12 100644 (file)
--- a/local/e2-ls-project.lua
+++ b/local/e2-ls-project.lua
@@ -32,6 +32,7 @@ require("e2tool")
 local err = require("err")
 local e2option = require("e2option")
 local scm = require("scm")
+local policy = require("policy")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "ls-project")

diff --git a/local/e2-playground.lua b/local/e2-playground.lua
index a116bd646aa8a27a97e080697635d44a634bd7ff..36c30f42a433a17cd4cf2aa0c7ee5be47bcd3d87 100644 (file)
--- a/local/e2-playground.lua
+++ b/local/e2-playground.lua
@@ -32,6 +32,7 @@ require("e2tool")
 local e2build = require("e2build")
 local err = require("err")
 local e2option = require("e2option")
+local policy = require("policy")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "playground")

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 457cadb505abf31d54357dcce99ae19446dbd657..d8fe7f63289c15a53fbadccb2fdfee1cc6398e29 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -43,7 +43,7 @@ local hash = require("hash")
 require("e2util")
 local e2option = require("e2option")
 local generic_git = require("generic_git")
-require("policy")
+local policy = require("policy")
 
 -- Information gathering and inquiry
 --