From dd00b5fd56140aa8cb221b2f9f76bada7b657848 Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Fri, 23 Oct 2020 11:57:47 +0800 Subject: [PATCH 1/6] update package info --- log/package_info.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 log/package_info.csv diff --git a/log/package_info.csv b/log/package_info.csv new file mode 100644 index 0000000..ceb79ff --- /dev/null +++ b/log/package_info.csv @@ -0,0 +1 @@ +zip,master -- Gitee From 6067d44983dc2d8d4b77200f46bc31abafdd6c38 Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Fri, 23 Oct 2020 14:01:54 +0800 Subject: [PATCH 2/6] add save method to main process --- common/parser_config.py | 1 - core/runner.py | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/parser_config.py b/common/parser_config.py index 0bcef48..2bb93b4 100644 --- a/common/parser_config.py +++ b/common/parser_config.py @@ -38,7 +38,6 @@ class ParserConfigIni(object): return: None """ branch_list = self.config.options("update_enable") - print(branch_list) for b in branch_list: self.update_enabled_flag[b] = common.str_to_bool(self.config.get("update_enable", b)) diff --git a/core/runner.py b/core/runner.py index a2ca71b..395fd1d 100644 --- a/core/runner.py +++ b/core/runner.py @@ -8,6 +8,7 @@ main script for running """ from common.log_obs import log from common.parser_config import ParserConfigIni +from core.save import SaveInfo class Runner(object): @@ -40,7 +41,8 @@ class Runner(object): return: """ log.debug("save package info") - # TODO + si = SaveInfo() + si.save_package_msg(self.kwargs["repostory"], self.kwargs["branch"]) def _update_package(self): """ -- Gitee From 3f03608f4d813f224b2f17d7a1d81ba7d860b45a Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Fri, 23 Oct 2020 14:04:58 +0800 Subject: [PATCH 3/6] delete csv file --- log/package_info.csv | 1 - 1 file changed, 1 deletion(-) delete mode 100644 log/package_info.csv diff --git a/log/package_info.csv b/log/package_info.csv deleted file mode 100644 index ceb79ff..0000000 --- a/log/package_info.csv +++ /dev/null @@ -1 +0,0 @@ -zip,master -- Gitee From e9c74821a0a7efab39d344d0f7511d460f4a9581 Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Fri, 23 Oct 2020 15:10:52 +0800 Subject: [PATCH 4/6] update package info --- log/package_info.csv | 1 + 1 file changed, 1 insertion(+) create mode 100644 log/package_info.csv diff --git a/log/package_info.csv b/log/package_info.csv new file mode 100644 index 0000000..ceb79ff --- /dev/null +++ b/log/package_info.csv @@ -0,0 +1 @@ +zip,master -- Gitee From 585952b3d92a87dac0ccc8a119b64d481d29444d Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Fri, 23 Oct 2020 15:12:46 +0800 Subject: [PATCH 5/6] replace repostory by repository --- core/runner.py | 8 ++++---- openeuler_obs.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/runner.py b/core/runner.py index 395fd1d..de4372f 100644 --- a/core/runner.py +++ b/core/runner.py @@ -42,7 +42,7 @@ class Runner(object): """ log.debug("save package info") si = SaveInfo() - si.save_package_msg(self.kwargs["repostory"], self.kwargs["branch"]) + si.save_package_msg(self.kwargs["repository"], self.kwargs["branch"]) def _update_package(self): """ @@ -59,12 +59,12 @@ class Runner(object): """ log.debug(self.ignore_list) log.debug(self.update_enabled_flag) - if self.kwargs["repostory"] == "obs_meta": + if self.kwargs["repository"] == "obs_meta": self._obs_meta_action() - elif self.kwargs["repostory"] not in self.ignore_list: + elif self.kwargs["repository"] not in self.ignore_list: if not self.update_enabled_flag[self.kwargs["branch"].lower()]: log.debug("can not update branch:%s, package: %s" - % (self.kwargs["branch"], self.kwargs["repostory"])) + % (self.kwargs["branch"], self.kwargs["repository"])) self._save_package_info() else: self._update_package() diff --git a/openeuler_obs.py b/openeuler_obs.py index 8db32a3..2390bcd 100644 --- a/openeuler_obs.py +++ b/openeuler_obs.py @@ -14,10 +14,10 @@ from core.runner import Runner par = argparse.ArgumentParser() par.add_argument("-o", "--obs", default=None, help="Local path of obs_meta repository", required=False) -par.add_argument("-r", "--repostory", +par.add_argument("-r", "--repository", help="gitee repository name", required=True) par.add_argument("-b", "--branch", default="master", - help="gitee repostory branch name", required=False) + help="gitee repository branch name", required=False) par.add_argument("-p", "--project", default=None, help="obs project name", required=False) args = par.parse_args() @@ -26,5 +26,5 @@ args = par.parse_args() obs_meta_path = args.obs log.info(obs_meta_path) run = Runner(obs_path=args.obs, project=args.project, - repostory=args.repostory, branch=args.branch) + repository=args.repository, branch=args.branch) run.run() -- Gitee From 6a3a23ea7ba55a0f184cafa2068c8c999a646768 Mon Sep 17 00:00:00 2001 From: miao_kaibo Date: Fri, 23 Oct 2020 15:14:00 +0800 Subject: [PATCH 6/6] delete package_info.csv --- log/package_info.csv | 1 - 1 file changed, 1 deletion(-) delete mode 100644 log/package_info.csv diff --git a/log/package_info.csv b/log/package_info.csv deleted file mode 100644 index ceb79ff..0000000 --- a/log/package_info.csv +++ /dev/null @@ -1 +0,0 @@ -zip,master -- Gitee