From: Tobias Ulmer Date: Tue, 4 Sep 2012 12:11:07 +0000 (+0200) Subject: Lock all modules and plugins with strict.lock() X-Git-Tag: e2factory-2.3.13rc1~116 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=59295acf55dfdec25cb91890d2e58f2ab1eaf4a5;p=e2factory.git Lock all modules and plugins with strict.lock() Signed-off-by: Tobias Ulmer --- diff --git a/generic/cache.lua b/generic/cache.lua index 0ea6895..4260347 100644 --- a/generic/cache.lua +++ b/generic/cache.lua @@ -30,6 +30,7 @@ local e2lib = require("e2lib") local transport = require("transport") local url = require("url") local err = require("err") +local strict = require("strict") --- cache -- @class table @@ -502,6 +503,6 @@ function cache.set_writeback(c, server, value) return true, nil end -return cache +return strict.lock(cache) -- vim:sw=4:sts=4:et: diff --git a/generic/e2option.lua b/generic/e2option.lua index 5893a63..6a05468 100644 --- a/generic/e2option.lua +++ b/generic/e2option.lua @@ -32,6 +32,7 @@ local e2lib = require("e2lib") require("e2util") local plugin = require("plugin") local err = require("err") +local strict = require("strict") local options = {} local aliases = {} @@ -39,6 +40,8 @@ local optionlist = {} -- ordered list of option names e2option.documentation = "" +e2option.opts = {} + --- register a flag option -- @param name string: option name -- @param doc string: documentation string @@ -387,6 +390,6 @@ Type e2 --licence for more information. e2lib.finish(rc) end -return e2option +return strict.lock(e2option) -- vim:sw=4:sts=4:et: diff --git a/generic/err.lua b/generic/err.lua index c2075ee..4fdc0f9 100644 --- a/generic/err.lua +++ b/generic/err.lua @@ -27,6 +27,7 @@ local err = {} local e2lib = require("e2lib") +local strict = require("strict") --- append a string to an error object -- @param format string: format string @@ -114,6 +115,6 @@ function err.toerror(x) end end -return err +return strict.lock(err) -- vim:sw=4:sts=4:et: diff --git a/generic/generic_git.lua b/generic/generic_git.lua index 49e7f6a..5062d76 100644 --- a/generic/generic_git.lua +++ b/generic/generic_git.lua @@ -29,11 +29,12 @@ -- take server / location local generic_git = {} +local e2lib = require("e2lib") local cache = require("cache") local url = require("url") local tools = require("tools") local err = require("err") -local e2lib = require("e2lib") +local strict = require("strict") --- clone a git repository -- @param surl url to the server @@ -621,6 +622,6 @@ function generic_git.new_repository(c, lserver, llocation, rserver, rlocation, f return true, nil end -return generic_git +return strict.lock(generic_git) -- vim:sw=4:sts=4:et: diff --git a/generic/hash.lua b/generic/hash.lua index df1be79..30f2908 100644 --- a/generic/hash.lua +++ b/generic/hash.lua @@ -27,8 +27,9 @@ ]] local hash = {} -require("sha1") local err = require("err") +local strict = require("strict") +require("sha1") --- create a hash context -- @return a hash context object, or nil on error @@ -121,6 +122,6 @@ function hash.hash_finish(hc) return cs end -return hash +return strict.lock(hash) -- vim:sw=4:sts=4:et: diff --git a/generic/lock.lua b/generic/lock.lua index 7265007..c1f299b 100644 --- a/generic/lock.lua +++ b/generic/lock.lua @@ -32,6 +32,7 @@ local lock = {} local err = require("err") local e2lib = require("e2lib") +local strict = require("strict") --- create a new lock context -- @return table: the lock context @@ -119,6 +120,6 @@ if test then end ]] -return lock +return strict.lock(lock) -- vim:sw=4:sts=4:et: diff --git a/generic/luafile.lua b/generic/luafile.lua index 537d9e6..592cdd3 100644 --- a/generic/luafile.lua +++ b/generic/luafile.lua @@ -26,6 +26,7 @@ ]] local luafile = {} +local strict = require("strict") require("luafile_ll") function luafile.new() @@ -137,6 +138,6 @@ function luafile.dup2(oldfd, newfd) return nil end -return luafile +return strict.lock(luafile) -- vim:sw=4:sts=4:et: diff --git a/generic/tools.lua b/generic/tools.lua index 2455cc9..49c7079 100644 --- a/generic/tools.lua +++ b/generic/tools.lua @@ -27,6 +27,7 @@ local tools = {} local e2lib = require("e2lib") +local strict = require("strict") require("buildconfig") local toollist = { @@ -183,6 +184,6 @@ function tools.init() return true, nil end -return tools +return strict.lock(tools) -- vim:sw=4:sts=4:et: diff --git a/generic/transport.lua b/generic/transport.lua index 2c29105..cef88dc 100644 --- a/generic/transport.lua +++ b/generic/transport.lua @@ -26,10 +26,11 @@ ]] local transport = {} +local e2lib = require("e2lib") local url = require("url") local tools = require("tools") local err = require("err") -local e2lib = require("e2lib") +local strict = require("strict") --- call rsync with appropriate rsh argument according to the tools -- configuration @@ -360,6 +361,6 @@ function transport.file_path(surl, location) return path end -return transport +return strict.lock(transport) -- vim:sw=4:sts=4:et: diff --git a/generic/url.lua b/generic/url.lua index a2eebbe..fee6608 100644 --- a/generic/url.lua +++ b/generic/url.lua @@ -26,6 +26,7 @@ ]] local url = {} +local strict = require("strict") --- parse -- @param url the url to parse @@ -75,6 +76,6 @@ function url.parse(url) return u, nil end -return url +return strict.lock(url) -- vim:sw=4:sts=4:et: diff --git a/global/e2-create-project.lua b/global/e2-create-project.lua index 115e2b7..5d78118 100644 --- a/global/e2-create-project.lua +++ b/global/e2-create-project.lua @@ -25,12 +25,12 @@ along with this program. If not, see . ]] -require("buildconfig") local e2lib = require("e2lib") local cache = require("cache") local generic_git = require("generic_git") local err = require("err") local e2option = require("e2option") +require("buildconfig") e2lib.init() diff --git a/global/e2-fetch-project.lua b/global/e2-fetch-project.lua index 6cdf25f..7d502cb 100644 --- a/global/e2-fetch-project.lua +++ b/global/e2-fetch-project.lua @@ -25,12 +25,12 @@ along with this program. If not, see . ]] -require("buildconfig") local e2lib = require("e2lib") local e2option = require("e2option") local generic_git = require("generic_git") local cache = require("cache") local err = require("err") +require("buildconfig") e2lib.init() local e = err.new("fetching project failed") diff --git a/global/e2-install-e2.lua b/global/e2-install-e2.lua index ffd1f4a..0720c06 100644 --- a/global/e2-install-e2.lua +++ b/global/e2-install-e2.lua @@ -25,11 +25,11 @@ along with this program. If not, see . ]] -require("buildconfig") local e2lib = require("e2lib") local e2option = require("e2option") local generic_git = require("generic_git") local err = require("err") +require("buildconfig") e2lib.init() diff --git a/local/cvs.lua b/local/cvs.lua index 005c7c6..4ff0ea8 100644 --- a/local/cvs.lua +++ b/local/cvs.lua @@ -26,12 +26,13 @@ ]] local cvs = {} +local e2lib = require("e2lib") local scm = require("scm") local hash = require("hash") local url = require("url") local tools = require("tools") local err = require("err") -local e2lib = require("e2lib") +local strict = require("strict") plugin_descriptor = { description = "CVS SCM Plugin", @@ -433,4 +434,6 @@ function cvs.check_workingcopy(info, sourcename) return true, nil end +strict.lock(cvs) + -- vim:sw=4:sts=4:et: diff --git a/local/e2build.lua b/local/e2build.lua index fe870f1..d181e6e 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -33,6 +33,7 @@ local e2lib = require("e2lib") local scm = require("scm") local environment = require("environment") local e2tool = require("e2tool") +local strict = require("strict") -- table of functions to drive the build process -- forward declaration, filled at the end of file @@ -1289,6 +1290,6 @@ build_process = { { prio=1400, name="chroot_unlock", func=chroot_unlock }, } -return e2build +return strict.lock(e2build) -- vim:sw=4:sts=4:et: diff --git a/local/e2tool.lua b/local/e2tool.lua index 3c933aa..9a601aa 100644 --- a/local/e2tool.lua +++ b/local/e2tool.lua @@ -42,6 +42,7 @@ require("e2util") local e2option = require("e2option") local generic_git = require("generic_git") local policy = require("policy") +local strict = require("strict") -- Information gathering and inquiry -- @@ -2985,6 +2986,6 @@ function e2tool.register_dlist(info, func) return true, nil end -return e2tool +return strict.lock(e2tool) -- vim:sw=4:sts=4:et: diff --git a/local/environment.lua b/local/environment.lua index 279bd63..b234d1c 100644 --- a/local/environment.lua +++ b/local/environment.lua @@ -27,6 +27,7 @@ local environment = {} local hash = require("hash") +local strict = require("strict") --- create new environment -- @return environment @@ -162,6 +163,6 @@ end -- unittest() -return environment +return strict.lock(environment) -- vim:sw=4:sts=4:et: diff --git a/local/files.lua b/local/files.lua index 2a5e054..f5a979a 100644 --- a/local/files.lua +++ b/local/files.lua @@ -31,6 +31,7 @@ local hash = require("hash") local err = require("err") local e2lib = require("e2lib") local e2tool = require("e2tool") +local strict = require("strict") plugin_descriptor = { description = "Files SCM Plugin", @@ -461,4 +462,6 @@ function files.update(info, sourcename) return true, nil end +strict.lock(files) + -- vim:sw=4:sts=4:et: diff --git a/local/git.lua b/local/git.lua index 7993bff..cb658d9 100644 --- a/local/git.lua +++ b/local/git.lua @@ -35,6 +35,7 @@ local err = require("err") local e2option = require("e2option") local e2lib = require("e2lib") local e2tool = require("e2tool") +local strict = require("strict") plugin_descriptor = { description = "Git SCM Plugin", @@ -614,4 +615,6 @@ function git.check_workingcopy(info, sourcename) return true, nil end +strict.lock(git) + -- vim:sw=4:sts=4:et: diff --git a/local/policy.lua b/local/policy.lua index dd4cba3..f9b3d25 100644 --- a/local/policy.lua +++ b/local/policy.lua @@ -26,9 +26,10 @@ ]] local policy = {} +local e2lib = require("e2lib") local err = require("err") local e2option = require("e2option") -local e2lib = require("e2lib") +local strict = require("strict") --- source_set_* get the source set identifier -- @class function @@ -255,6 +256,6 @@ function policy.default_build_mode(mode) end end -return policy +return strict.lock(policy) -- vim:sw=4:sts=4:et: diff --git a/local/svn.lua b/local/svn.lua index 3f1a466..f84c9aa 100644 --- a/local/svn.lua +++ b/local/svn.lua @@ -32,6 +32,7 @@ local url = require("url") local tools = require("tools") local err = require("err") local e2lib = require("e2lib") +local strict = require("strict") plugin_descriptor = { description = "SVN SCM Plugin", @@ -380,4 +381,6 @@ function svn.validate_source(info, sourcename) return true, nil end +strict.lock(svn) + -- vim:sw=4:sts=4:et: