From 7f9650c49043f6c33cd971e733a7930461e90d12 Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Mon, 6 Aug 2012 11:09:39 +0200 Subject: [PATCH] require cache module explicitly Signed-off-by: Tobias Ulmer --- generic/e2lib.lua | 2 +- generic/generic_git.lua | 1 + global/e2-create-project.lua | 1 + global/e2-fetch-project.lua | 1 + local/git.lua | 1 + local/new-source.lua | 2 ++ 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/generic/e2lib.lua b/generic/e2lib.lua index c7c4860..bc34281 100644 --- a/generic/e2lib.lua +++ b/generic/e2lib.lua @@ -32,7 +32,7 @@ require("lock") require("err") require("plugin") require("tools") -require("cache") +local cache = require("cache") require("luafile") _version = "e2factory, the emlix embedded build system, version " .. diff --git a/generic/generic_git.lua b/generic/generic_git.lua index 64a3e38..d8a21ef 100644 --- a/generic/generic_git.lua +++ b/generic/generic_git.lua @@ -29,6 +29,7 @@ -- take server / location module("generic_git", package.seeall) +local cache = require("cache") --- clone a git repository -- @param surl url to the server diff --git a/global/e2-create-project.lua b/global/e2-create-project.lua index 2903f75..a5d8599 100644 --- a/global/e2-create-project.lua +++ b/global/e2-create-project.lua @@ -29,6 +29,7 @@ require("buildconfig") require("e2lib") require("e2option") require("generic_git") +local cache = require("cache") e2lib.init() diff --git a/global/e2-fetch-project.lua b/global/e2-fetch-project.lua index 918efc8..0677910 100644 --- a/global/e2-fetch-project.lua +++ b/global/e2-fetch-project.lua @@ -29,6 +29,7 @@ require("buildconfig") require("e2lib") require("e2option") require("generic_git") +local cache = require("cache") e2lib.init() local e = new_error("fetching project failed") diff --git a/local/git.lua b/local/git.lua index dda7c23..4b32e17 100644 --- a/local/git.lua +++ b/local/git.lua @@ -32,6 +32,7 @@ module("git", package.seeall) require("scm") local hash = require("hash") +local cache = require("cache") --- git branch wrapper -- get the current branch diff --git a/local/new-source.lua b/local/new-source.lua index 9286850..828372d 100644 --- a/local/new-source.lua +++ b/local/new-source.lua @@ -30,6 +30,8 @@ require("e2local") require("e2tool") +local cache = require("cache") + e2lib.init() local info, re = e2tool.local_init(nil, "new-source") if not info then -- 2.39.5