From: Tobias Ulmer Date: Tue, 15 Apr 2014 14:45:10 +0000 (+0200) Subject: Remove source validation, sources are valid at this point X-Git-Tag: e2factory-2.3.15rc1~210 X-Git-Url: https://git.e2factory.org/?a=commitdiff_plain;h=1a46ff503d8cb38f11da5c0c070b6885a8411957;p=e2factory.git Remove source validation, sources are valid at this point Signed-off-by: Tobias Ulmer --- diff --git a/local/scm.lua b/local/scm.lua index e646663..03b3551 100644 --- a/local/scm.lua +++ b/local/scm.lua @@ -149,10 +149,7 @@ end local function source_apply_default_licences(info, sourcename) local e = err.new("applying default licences failed.") local src = info.sources[ sourcename ] - if src.licences_default_applied then - return true - end - src.licences_default_applied = true + if not src.licences and src.licence then e2lib.warnf("WDEPRECATED", "in source %s:", src.name) e2lib.warnf("WDEPRECATED", @@ -265,10 +262,7 @@ end -- @return an error object on failure function scm.generic_source_check(info, sourcename, require_workingcopy) local rc, re - rc, re = scm.validate_source(info, sourcename) - if not rc then - return false, re - end + rc, re = scm.working_copy_available(info, sourcename) if (not rc) and require_workingcopy then return false, err.new("working copy is not available") diff --git a/plugins/cvs.lua b/plugins/cvs.lua index fd32d88..944b5e8 100644 --- a/plugins/cvs.lua +++ b/plugins/cvs.lua @@ -175,11 +175,6 @@ end function cvs.fetch_source(info, sourcename) local rc, re, e, src, cvsroot, workdir, argv - rc, re = cvs.validate_source(info, sourcename) - if not rc then - return false, re - end - e = err.new("fetching source failed: %s", sourcename) src = info.sources[sourcename] @@ -218,11 +213,6 @@ end function cvs.prepare_source(info, sourcename, source_set, buildpath) local rc, re, e, src, cvsroot, argv - rc, re = cvs.validate_source(info, sourcename) - if not rc then - return false, re - end - e = err.new("cvs.prepare_source failed") src = info.sources[sourcename] @@ -270,11 +260,6 @@ end function cvs.update(info, sourcename) local rc, re, e, src, workdir, argv - rc, re = cvs.validate_source(info, sourcename) - if not rc then - return false, re - end - e = err.new("updating source '%s' failed", sourcename) src = info.sources[sourcename] @@ -290,11 +275,6 @@ function cvs.update(info, sourcename) end function cvs.working_copy_available(info, sourcename) - local rc, e - rc, e = cvs.validate_source(info, sourcename) - if not rc then - return false, e - end local src = info.sources[sourcename] local dir = string.format("%s/%s", info.root, src.working) return e2lib.isdir(dir) @@ -312,11 +292,8 @@ end function cvs.display(info, sourcename) local src = info.sources[sourcename] local rc, re - rc, re = cvs.validate_source(info, sourcename) - if not rc then - return false, re - end local display = {} + display[1] = string.format("type = %s", src.type) display[2] = string.format("branch = %s", src.branch) display[3] = string.format("tag = %s", src.tag) @@ -341,10 +318,7 @@ end function cvs.sourceid(info, sourcename, source_set) local src = info.sources[sourcename] local rc, re, lid - rc, re = cvs.validate_source(info, sourcename) - if not rc then - return false, re - end + if source_set == "working-copy" then src.sourceid[source_set] = "working-copy" end @@ -449,19 +423,7 @@ function cvs.toresult(info, sourcename, sourceset, directory) end function cvs.check_workingcopy(info, sourcename) - local rc, re - local e = err.new("checking working copy failed") - e:append("in source %s (cvs configuration):", sourcename) - e:setcount(0) - rc, re = cvs.validate_source(info, sourcename) - if not rc then - return false, re - end - local src = info.sources[sourcename] - if e:getcount() > 0 then - return false, e - end - return true, nil + return true end strict.lock(cvs) diff --git a/plugins/files.lua b/plugins/files.lua index 478be66..7367c87 100644 --- a/plugins/files.lua +++ b/plugins/files.lua @@ -125,10 +125,6 @@ end -- @return nil, an error string on error function files.cache_source(info, sourcename) local rc, e - rc, e = files.validate_source(info, sourcename) - if not rc then - return false, e - end local s = info.sources[sourcename] -- cache all files for this source for i,f in pairs(s.file) do @@ -152,10 +148,6 @@ end function files.fetch_source(info, sourcename) local rc, re local e = err.new("fetching source failed: %s", sourcename) - rc, re = files.validate_source(info, sourcename) - if not rc then - return false, e:cat(re) - end local rc, re = files.cache_source(info, sourcename) if not rc then return false, e:cat(re) @@ -164,20 +156,10 @@ function files.fetch_source(info, sourcename) end function files.working_copy_available(info, sourcename) - local rc, e - rc, e = files.validate_source(info, sourcename) - if not rc then - return false, e - end return false end function files.has_working_copy(info, sourcename) - local rc, e - rc, e = files.validate_source(info, sourcename) - if not rc then - return false, e - end return false end @@ -336,10 +318,6 @@ end function files.prepare_source(info, sourcename, sourceset, buildpath) local rc, re local e = err.new("error preparing source: %s", sourcename) - rc, re = files.validate_source(info, sourcename) - if not rc then - return false, e:cat(re) - end local symlink = nil local s = info.sources[sourcename] for _,file in ipairs(info.sources[sourcename].file) do @@ -448,13 +426,9 @@ end -- @return a table, nil on error -- @return an error string on failure function files.display(info, sourcename) - local rc, e - rc, e = files.validate_source(info, sourcename) - if not rc then - return false, e - end local src = info.sources[sourcename] local display = {} + display[1] = string.format("type = %s", src.type) local i = 2 for _,f in pairs(src.file) do @@ -481,11 +455,7 @@ end function files.sourceid(info, sourcename, sourceset) local rc, re local e = err.new("error calculating sourceid for source: %s", - sourcename) - rc, re = files.validate_source(info, sourcename) - if not rc then - return false, re - end + sourcename) local src = info.sources[sourcename] if src.sourceid then return true, nil, src.sourceid @@ -531,10 +501,6 @@ end function files.toresult(info, sourcename, sourceset, directory) local rc, re, out local e = err.new("converting result failed") - rc, re = files.validate_source(info, sourcename) - if not rc then - return false, e:cat(re) - end local s = info.sources[sourcename] local source = "source" -- directory to store source files in local makefile = e2lib.join(directory, "Makefile") diff --git a/plugins/git.lua b/plugins/git.lua index 3b604cf..d8fc00f 100644 --- a/plugins/git.lua +++ b/plugins/git.lua @@ -90,11 +90,6 @@ function git.git_commit_id(info, sourcename, sourceset, check_remote) e = err.new("getting commit ID failed for source: %s", sourcename) src = info.sources[sourcename] - rc, re = git.validate_source(info, sourcename) - if not rc then - return false, e:cat(re) - end - rc, re = scm.working_copy_available(info, sourcename) if not rc then return false, e:append("working copy is not available") @@ -273,11 +268,6 @@ function git.fetch_source(info, sourcename) src = info.sources[sourcename] e = err.new("fetching source failed: %s", sourcename) - rc, re = git.validate_source(info, sourcename) - if not rc then - return false, e:cat(re) - end - work_tree = e2lib.join(info.root, src.working) git_dir = e2lib.join(work_tree, ".git") @@ -422,10 +412,6 @@ function git.working_copy_available(info, sourcename) local rc, re local e = err.new("checking if working copy is available for source %s", sourcename) - rc, re = git.validate_source(info, sourcename) - if not rc then - return false, e:cat(re) - end local gitwc = e2lib.join(info.root, src.working) local rc = e2lib.isdir(gitwc) return rc, nil @@ -467,10 +453,6 @@ function git.display(info, sourcename) local src = info.sources[sourcename] local rc, re local e = err.new("display source information failed") - rc, re = git.validate_source(info, sourcename) - if not rc then - return nil, e:cat(re) - end -- try to calculte the sourceid, but do not care if it fails. -- working copy might be unavailable scm.sourceid(info, sourcename, "tag") @@ -654,11 +636,6 @@ function git.check_workingcopy(info, sourcename) local rc, re local e = err.new("checking working copy of source %s failed", sourcename) - rc, re = git.validate_source(info, sourcename) - if not rc then - return false, re - end - rc, re = scm.working_copy_available(info, sourcename) if not rc then e2lib.warnf("WOTHER", "in source %s: ", sourcename) diff --git a/plugins/svn.lua b/plugins/svn.lua index 939751a..9ab8771 100644 --- a/plugins/svn.lua +++ b/plugins/svn.lua @@ -144,10 +144,7 @@ local function svn_tool(argv, workdir) end function svn.fetch_source(info, sourcename) - local rc, re = svn.validate_source(info, sourcename) - if not rc then - return false, re - end + local rc, re local e = err.new("fetching source failed: %s", sourcename) local src = info.sources[sourcename] local location = src.location @@ -171,10 +168,7 @@ function svn.fetch_source(info, sourcename) end function svn.prepare_source(info, sourcename, source_set, build_path) - local rc, re = svn.validate_source(info, sourcename) - if not rc then - return false, re - end + local rc, re local e = err.new("svn.prepare_source failed") local src = info.sources[ sourcename ] local location = src.location @@ -216,10 +210,6 @@ end function svn.working_copy_available(info, sourcename) local rc, re - rc, re = svn.validate_source(info, sourcename) - if not rc then - return false, re - end local src = info.sources[sourcename] local dir = e2lib.join(info.root, src.working) return e2lib.isdir(dir) @@ -230,10 +220,6 @@ function svn.check_workingcopy(info, sourcename) local e = err.new("checking working copy failed") e:append("in source %s (svn configuration):", sourcename) e:setcount(0) - rc, re = svn.validate_source(info, sourcename) - if not rc then - return false, re - end local src = info.sources[sourcename] if e:getcount() > 0 then return false, e @@ -266,10 +252,6 @@ end function svn.display(info, sourcename) local src = info.sources[sourcename] local rc, e - rc, e = svn.validate_source(info, sourcename) - if not rc then - return false, e - end local display = {} display[1] = string.format("type = %s", src.type) display[2] = string.format("server = %s", src.server) @@ -294,10 +276,6 @@ function svn.sourceid(info, sourcename, source_set) local rc, re local hc, surl, svnurl, argv, out, svnrev, lid - rc, re = svn.validate_source(info, sourcename) - if not rc then - return false, re - end if not src.sourceid then src.sourceid = {} end @@ -423,10 +401,7 @@ function svn.toresult(info, sourcename, sourceset, directory) end function svn.update(info, sourcename) - local rc, re = svn.validate_source(info, sourcename) - if not rc then - return false, re - end + local rc, re local e = err.new("updating source '%s' failed", sourcename) local src = info.sources[ sourcename ] local workdir = e2lib.join(info.root, src.working)