From 080bfaa2bc69b4b303a69e5072beee52d9ec7a3b Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Thu, 3 Dec 2020 19:02:40 +0800
Subject: [PATCH 1/2] fix #I281Y2

---
 core/save.py     | 8 ++++----
 openeuler_obs.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/save.py b/core/save.py
index 1bb2550..c8a0083 100644
--- a/core/save.py
+++ b/core/save.py
@@ -111,11 +111,11 @@ class SaveInfo(object):
                 file_list = os.listdir(datestr_root_path)
                 prj_list = self.branch_prj[branch_name].split(" ")
                 log.debug(prj_list)
+                var_list = []
                 for prj in prj_list:
                     cmd = "osc list %s" % prj
                     log.debug(cmd)
                     pkgs = os.popen(cmd).read().split("\n")
-                    var_list = []
                     for pkg in pkgs:
                         var_list.append(([datestr_root_path, prj, pkg, file_list, f_csv], None))
                 try:
@@ -126,11 +126,11 @@ class SaveInfo(object):
                     pool.wait()
                 except KeyboardInterrupt as e:
                     log.error(e)
-            cmd = "sort -u -r %s.csv > tmp && cat tmp > %s.csv" % (datestr_root_path, datestr_root_path)
+            cmd = "sort -u -r %s > tmp && cat tmp > %s" % (latest_rpm_file, latest_rpm_file)
             if os.system(cmd) != 0:
                 log.error("sort file fail")
-            cmd = "cd %s && git pull && git add %s.csv && git commit -m 'update file' && git push" % \
-                    (self.obs_pkg_rpms_files_dir, datestr_root_path)
+            cmd = "cd %s && git pull && git add * && git commit -m 'update file' && git push" % \
+                    self.obs_pkg_rpms_files_dir
             os.system(cmd)
         except AttributeError as e:
             log.error(e)
diff --git a/openeuler_obs.py b/openeuler_obs.py
index e1a10e5..8f427a2 100644
--- a/openeuler_obs.py
+++ b/openeuler_obs.py
@@ -59,7 +59,7 @@ par.add_argument("--pkglist", default=None, nargs='+',
         help="packages list, connect everyone by espace.", required=False)
 
 par.add_argument("-up", "--repo_rpms_update", default=False,
-        help="update obs repo rpms.\
+        help="update obs repo rpms. type bool, default False, \
         should be used with project repo arch rsip rsu rsup rsp gitee_user gitee_pwd, \
         and pkglist will be used if update some packges not all.", required=False)
 par.add_argument("-repo", "--repo", default=None,
@@ -77,7 +77,7 @@ par.add_argument("-rsp", "--repo_server_port", default=None,
 
 par.add_argument("-latest", "--latest_info", default=False,
         help="store latest package info by branch to gitee repo obs_pkg_rpms, \
-                should be with -b -guser -gpwd.", required=False)
+                type is bool, default False, should be with -b -guser -gpwd.", required=False)
 
 args = par.parse_args()
 #apply
-- 
Gitee


From 2e5130f916f9157ca2ebf74417163aa67e5a7e6d Mon Sep 17 00:00:00 2001
From: miao_kaibo <miaokaibo@outlook.com>
Date: Thu, 3 Dec 2020 19:27:12 +0800
Subject: [PATCH 2/2] update

---
 core/save.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/save.py b/core/save.py
index c8a0083..2dd1813 100644
--- a/core/save.py
+++ b/core/save.py
@@ -131,6 +131,7 @@ class SaveInfo(object):
                 log.error("sort file fail")
             cmd = "cd %s && git pull && git add * && git commit -m 'update file' && git push" % \
                     self.obs_pkg_rpms_files_dir
+            log.debug(cmd)
             os.system(cmd)
         except AttributeError as e:
             log.error(e)
-- 
Gitee