Require scm

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

diff --git a/local/cvs.lua b/local/cvs.lua
index 3f620f35265ba6eeabb90e8ce55d140bc4c6f1da..d4342523d798f581e792a856b5ac8c8f278eea26 100644 (file)
--- a/local/cvs.lua
+++ b/local/cvs.lua
@@ -28,7 +28,7 @@
 -- cvs.lua - CVS-specific SCM operations -*- Lua -*-
 --
 module("cvs", package.seeall)
-require("scm")
+local scm = require("scm")
 local hash = require("hash")
 local url = require("url")
 local tools = require("tools")

diff --git a/local/e2-build.lua b/local/e2-build.lua
index 379c3fae75f7272cd34ac592155fc70d9482b5da..864d0a64e852e73799f9b124c77cb02b2e599a72 100644 (file)
--- a/local/e2-build.lua
+++ b/local/e2-build.lua
@@ -30,6 +30,7 @@ require("e2tool")
 require("e2build")
 local err = require("err")
 local e2option = require("e2option")
+local scm = require("scm")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "build")

diff --git a/local/e2-fetch-sources.lua b/local/e2-fetch-sources.lua
index 2a2744fddf52abf59e909e36f5b9964e0c890856..b82920f42d265cfc1261b6cb1ca4b6709aa8b538 100644 (file)
--- a/local/e2-fetch-sources.lua
+++ b/local/e2-fetch-sources.lua
@@ -32,6 +32,7 @@ require("e2tool")
 require("e2build")
 local err = require("err")
 local e2option = require("e2option")
+local scm = require("scm")
 
 e2lib.init()
 local info, re = e2tool.local_init(nil, "fetch-sources")

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

diff --git a/local/e2build.lua b/local/e2build.lua
index 53c9ddc42c48080329493aca96c3721d95b1e51e..b2e71bede2bf8353f4022c7998e3aeb7d89ce051 100644 (file)
--- a/local/e2build.lua
+++ b/local/e2build.lua
@@ -32,6 +32,7 @@ local transport = require("transport")
 local tools = require("tools")
 local err = require("err")
 local e2lib = require("e2lib")
+local scm = require("scm")
 
 --- cache a result
 -- @param info

diff --git a/local/e2tool.lua b/local/e2tool.lua
index 35099a1145a95dabc08c01a752d3c30448308f5d..dbbb82668352d09a2fc8dd6e554f7b47f018a8d5 100644 (file)
--- a/local/e2tool.lua
+++ b/local/e2tool.lua
@@ -33,7 +33,7 @@ module("e2tool", package.seeall)
 local e2lib = require("e2lib")
 require("strict")
 local err = require("err")
-require("scm")
+local scm = require("scm")
 require("files")
 require("git")
 require("cvs")

diff --git a/local/files.lua b/local/files.lua
index d28204879cf544cb360964d74725cedaa0c1b42a..97cfede8d97d7fb823c33f1f6f3357e0b0a0b25b 100644 (file)
--- a/local/files.lua
+++ b/local/files.lua
@@ -30,7 +30,7 @@
 -- See e2scm.lua for more information about these operations.
 
 module("files", package.seeall)
-require("scm")
+local scm = require("scm")
 local hash = require("hash")
 local err = require("err")
 local e2lib = require("e2lib")

diff --git a/local/git.lua b/local/git.lua
index 7b5dc3b1d4268da9ac6f561e102f17ef2befd8c1..0a3c53ad426d5292d925dd295bfabc793dc8e66a 100644 (file)
--- a/local/git.lua
+++ b/local/git.lua
@@ -30,7 +30,7 @@
 -- See e2scm.lua for more information about these operations.
 
 module("git", package.seeall)
-require("scm")
+local scm = require("scm")
 local hash = require("hash")
 local cache = require("cache")
 local generic_git = require("generic_git")

diff --git a/local/svn.lua b/local/svn.lua
index 88bdc6b7f0490d2f6715047eb963b1d380846339..2804150b5482118f3ba2d014da0dc49ec2a74ee2 100644 (file)
--- a/local/svn.lua
+++ b/local/svn.lua
@@ -28,7 +28,7 @@
 -- svn.lua - Subversion-specific SCM operations -*- Lua -*-
 
 module("svn", package.seeall)
-require("scm")
+local scm = require("scm")
 local hash = require("hash")
 local url = require("url")
 local tools = require("tools")