From f5de017ef46a73dba999510d179a7537e19d2b5c Mon Sep 17 00:00:00 2001 From: licihua Date: Sun, 23 Aug 2020 17:33:14 +0800 Subject: [PATCH 1/7] fix gmp version exception --- advisors/helper/ver_rec_excpt.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/advisors/helper/ver_rec_excpt.yaml b/advisors/helper/ver_rec_excpt.yaml index fcf6f7b0..5fe4f266 100644 --- a/advisors/helper/ver_rec_excpt.yaml +++ b/advisors/helper/ver_rec_excpt.yaml @@ -23,3 +23,7 @@ sombok: shadow: - '1999' - '2000' +gmp: + - '2v0v2' + - '2v0v1' + - '2v0' -- Gitee From c1de88868982220ad9a8525570e8a5b01a3977ed Mon Sep 17 00:00:00 2001 From: licihua Date: Sun, 23 Aug 2020 17:46:47 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dx.y.z=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=B1=BB=E5=9E=8B=E4=B8=AD=E4=BB=85=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E4=B8=80=E4=BD=8D=E7=89=88=E6=9C=AC=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- advisors/version_recommend.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/advisors/version_recommend.py b/advisors/version_recommend.py index 49bed968..f59b589b 100755 --- a/advisors/version_recommend.py +++ b/advisors/version_recommend.py @@ -329,6 +329,8 @@ class VersionTypeXYZ(VersionType): version_candidate = [] version_digital = re.split(r'[._-]', current_version) # 将版本号做拆分 + if len(version_entry) <= 1: # 如果当前版本号仅一位，不能判断维护版本号 + return '.'.join(version_digital) xy = version_digital[0:2] for version in version_entry: version_temp = re.split(r'[._-]', version) @@ -387,6 +389,8 @@ class VersionTypeXYZ(VersionType): version_candidate.clear() for version in version_list: # 将第二位最大的列入候选列表,准备第三位比较 + if len(version) <= 1: # 过滤仅一位的版本号 + continue if y == version[1]: version_candidate.append(version) -- Gitee From bd04abc8e66d6ca3eb25eda28b2e94012819b664 Mon Sep 17 00:00:00 2001 From: licihua Date: Sun, 23 Aug 2020 17:56:24 +0800 Subject: [PATCH 3/7] fix gnu-free-fonts yaml error --- upstream-info/gnu-free-fonts.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upstream-info/gnu-free-fonts.yaml b/upstream-info/gnu-free-fonts.yaml index 05e75a6e..48ad1474 100644 --- a/upstream-info/gnu-free-fonts.yaml +++ b/upstream-info/gnu-free-fonts.yaml @@ -1,4 +1,4 @@ version_control: NA -src_repo: https://svn.savannah.gnu.org/viewvc/freefont +src_repo: http://svn.savannah.gnu.org/svn/freefont tag_repo: RELEASE_ separator: . -- Gitee From c3d2642c1459e908f0632bc5a79ece2ac9b60402 Mon Sep 17 00:00:00 2001 From: licihua Date: Mon, 24 Aug 2020 09:50:52 +0800 Subject: [PATCH 4/7] fix psacct yaml --- upstream-info/psacct.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/upstream-info/psacct.yaml b/upstream-info/psacct.yaml index 07c767a5..03887ad9 100644 --- a/upstream-info/psacct.yaml +++ b/upstream-info/psacct.yaml @@ -1,4 +1,4 @@ -version_control: svn -src_repo: http://svn.savannah.gnu.org/svn/acct/ -tag_prefix: ^ -seperator: . +version_control: gnu-ftp +src_repo: acct +tag_pattern: acct-(.*).tar.gz(.sig)? +seperator: "." -- Gitee From 80e2fb96fdf40a5fbebac0843fea3da04f71567c Mon Sep 17 00:00:00 2001 From: licihua Date: Mon, 24 Aug 2020 10:07:05 +0800 Subject: [PATCH 5/7] fix check_upstream string index out of range --- advisors/check_upstream.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/advisors/check_upstream.py b/advisors/check_upstream.py index 22e3ccc5..3d82c1ad 100755 --- a/advisors/check_upstream.py +++ b/advisors/check_upstream.py @@ -59,8 +59,7 @@ def clean_tags(tags, info): if info.get("seperator", ".") != "." and info.get("seperator", ".") is not None: separator_regex = re.compile(info["seperator"]) result_list = [separator_regex.sub(".", x) for x in result_list] - - result_list = [x for x in result_list if x[0].isdigit()] + result_list = [x for x in result_list if x != '' and x[0].isdigit()] return result_list -- Gitee From 6a49f072b22d05054f590b8e7fa7f8adc1fe89be Mon Sep 17 00:00:00 2001 From: licihua Date: Mon, 24 Aug 2020 14:11:29 +0800 Subject: [PATCH 6/7] git svn url --- upstream-info/psacct.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/upstream-info/psacct.yaml b/upstream-info/psacct.yaml index 03887ad9..75eedd6f 100644 --- a/upstream-info/psacct.yaml +++ b/upstream-info/psacct.yaml @@ -2,3 +2,4 @@ version_control: gnu-ftp src_repo: acct tag_pattern: acct-(.*).tar.gz(.sig)? seperator: "." +svn_url: http://svn.savannah.gnu.org/svn/acct/ -- Gitee From 0c5786e6eec6a3fc739ab4bf54a53ecead6d5eb1 Mon Sep 17 00:00:00 2001 From: licihua Date: Mon, 24 Aug 2020 14:17:39 +0800 Subject: [PATCH 7/7] fix out of range --- advisors/check_upstream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/advisors/check_upstream.py b/advisors/check_upstream.py index 3d82c1ad..c9de3aa4 100755 --- a/advisors/check_upstream.py +++ b/advisors/check_upstream.py @@ -59,7 +59,7 @@ def clean_tags(tags, info): if info.get("seperator", ".") != "." and info.get("seperator", ".") is not None: separator_regex = re.compile(info["seperator"]) result_list = [separator_regex.sub(".", x) for x in result_list] - result_list = [x for x in result_list if x != '' and x[0].isdigit()] + result_list = [x for x in result_list if x and x[0].isdigit()] return result_list -- Gitee