From 1cbf9439c1498b44a14b8fa2a4f5520dcd4ef525 Mon Sep 17 00:00:00 2001
From: wangchuangGG <wangchuang12@huawei.com>
Date: Thu, 17 Sep 2020 19:33:01 +0800
Subject: [PATCH] mod tags

---
 src/ac/framework/ac.py | 8 ++++----
 src/utils/check_abi.py | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ac/framework/ac.py b/src/ac/framework/ac.py
index 770e49c..5d262d6 100644
--- a/src/ac/framework/ac.py
+++ b/src/ac/framework/ac.py
@@ -68,9 +68,9 @@ class AC(object):
             # do ac check
             try:
                 result = entry()
-                logger.debug("check result {}".format(element, result))
+                logger.debug("check result {} {}".format(element, result))
             except Exception as exc:
-                logger.exception("check exception, {}".format(element, exc))
+                logger.exception("check exception, {} {}".format(element, exc))
                 continue
 
             # show in gitee, must starts with "check_"
@@ -144,10 +144,10 @@ if "__main__" == __name__:
     logger.info("------------------AC START--------------")
 
     # notify gitee
-    # TODO use replace all tags instead, state machine in future
     from src.proxy.gitee_proxy import GiteeProxy
     gp = GiteeProxy(args.owner, args.repo, args.token)
-    gp.delete_tag_of_pr(args.pr, "ci_finished")
+    gp.delete_tag_of_pr(args.pr, "ci_success")
+    gp.delete_tag_of_pr(args.pr, "ci_fail")
     gp.create_tags_of_pr(args.pr, "ci_processing")
 
     ac = AC(os.path.join(os.path.dirname(os.path.realpath(__file__)), "ac.yaml"))
diff --git a/src/utils/check_abi.py b/src/utils/check_abi.py
index c72ffb6..bb828c2 100755
--- a/src/utils/check_abi.py
+++ b/src/utils/check_abi.py
@@ -65,7 +65,7 @@ class CheckAbi(object):
                     continue
                 if filename.split(".")[-1] in exception_list:
                     continue
-                if ".so" in filename:
+                if ".so." in filename or filename.endswith(".so"):
                     logging.debug(".so file found:%s", fp)
                     so_files.add(fp)
                     if add_global:
@@ -215,7 +215,7 @@ class CheckAbi(object):
             all_abidiff_files.append(abidiff_file)
             logging.info("result write in: %s, returncode:%d", abidiff_file, ret.returncode)
             return_code |= ret.returncode
-        if return_code != 0:
+        if not return_code in [0, 1]:
             self.diff_result_file = self.merge_all_abidiff_files(all_abidiff_files, base_name)
             logging.info("abidiff all results writed in: %s", self.diff_result_file)
         return return_code
-- 
Gitee