From 863a3456c36b6314e3340cc908718a0a94d0e49d Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Fri, 21 Oct 2016 17:45:54 +0200 Subject: [PATCH] result: rename to chroot_list() Signed-off-by: Tobias Ulmer --- local/e2build.lua | 2 +- local/result.lua | 12 ++++++------ plugins/collect_project.lua | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/local/e2build.lua b/local/e2build.lua index fb78829..9585bac 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -422,7 +422,7 @@ function e2build.build_process_class:_setup_chroot(res, return_flags) end local grp, path - for cgrpnm in res:my_chroot_list():iter_sorted() do + for cgrpnm in res:chroot_list():iter_sorted() do grp = chroot.groups_byname[cgrpnm] for f in grp:file_iter() do diff --git a/local/result.lua b/local/result.lua index a34d232..52479ad 100644 --- a/local/result.lua +++ b/local/result.lua @@ -121,8 +121,8 @@ end --- Return the list of chroot groups for this result. -- @return string list of required chroot groups. -function result.basic_result:my_chroot_list() - error(err.new("called my_chroot_list() of result base class, type %s name %s", +function result.basic_result:chroot_list() + error(err.new("called chroot_list() of result base class, type %s name %s", self._type, self._name)) end @@ -300,7 +300,7 @@ function result.result_class:initialize(rawres) e:append("chroot group does not exist: %s", g) end - self:my_chroot_list():insert(g) + self:chroot_list():insert(g) end end @@ -366,7 +366,7 @@ function result.result_class:my_sources_list() return self._sources_list end -function result.result_class:my_chroot_list() +function result.result_class:chroot_list() return self._chroot_list end @@ -494,7 +494,7 @@ function result.result_class:buildid() end -- chroot - for groupname in self:my_chroot_list():iter_sorted() do + for groupname in self:chroot_list():iter_sorted() do id, re = chroot.groups_byname[groupname]:chrootgroupid(info) if not id then return false, e:cat(re) @@ -555,7 +555,7 @@ function result.result_class:attribute_table(flagt) table.insert(t, { "sources", self:my_sources_list():unpack()}) table.insert(t, { "depends", self:depends_list():unpack()}) if flagt.chroot then - table.insert(t, { "chroot", self:my_chroot_list():unpack()}) + table.insert(t, { "chroot", self:chroot_list():unpack()}) end if flagt.env then local tenv = { "env" } diff --git a/plugins/collect_project.lua b/plugins/collect_project.lua index 77d5059..e6494d6 100644 --- a/plugins/collect_project.lua +++ b/plugins/collect_project.lua @@ -132,7 +132,7 @@ local function _build_collect_project(self, res, return_flags) err.new("can not convert result %q, type %q is unsupported", dep:get_name(), dep:get_type()) end - cp_chroot:insert_sl(dep:my_chroot_list()) + cp_chroot:insert_sl(dep:chroot_list()) cp_sources:insert_sl(dep:my_sources_list()) end @@ -304,7 +304,7 @@ local function _build_collect_project(self, res, return_flags) -- generate config out = { string.format("### generated by e2factory for result %s ###\n", depname), - string.format("CHROOT='%s'\n", dep:my_chroot_list():concat_sorted(" ")), + string.format("CHROOT='%s'\n", dep:chroot_list():concat_sorted(" ")), string.format("DEPEND='%s'\n", dep:depends_list():concat_sorted(" ")), string.format("SOURCE='%s'\n", dep:my_sources_list():concat_sorted(" ")), } @@ -492,8 +492,8 @@ function collect_project_class:build_process() return bp end -function collect_project_class:my_chroot_list() - return self._stdresult:my_chroot_list() +function collect_project_class:chroot_list() + return self._stdresult:chroot_list() end function collect_project_class:merged_env() -- 2.39.5