diff --git a/advisors/check_upstream.py b/advisors/check_upstream.py index 873c614bc68bc1d7e3a6442592b677e776bb4763..2326dae5169003a12d496ff9ececd3f757728920 100755 --- a/advisors/check_upstream.py +++ b/advisors/check_upstream.py @@ -60,7 +60,7 @@ def clean_tags(tags, info): 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 len(x) > 0 and x[0].isdigit()] + result_list = [x for x in result_list if x and x[0].isdigit()] return result_list diff --git a/advisors/helper/version_exceptions.yaml b/advisors/helper/version_exceptions.yaml index fcf6f7b0767b0f820fe265e937a30b299fc7b29e..5fe4f2665fafff2cf6fe0d59a17ed417e1b24c85 100644 --- a/advisors/helper/version_exceptions.yaml +++ b/advisors/helper/version_exceptions.yaml @@ -23,3 +23,7 @@ sombok: shadow: - '1999' - '2000' +gmp: + - '2v0v2' + - '2v0v1' + - '2v0' diff --git a/advisors/version_recommend.py b/advisors/version_recommend.py index 49bed968cc35401f4bb5569d9a885a8110044296..f59b589ba09a84e19ea48b765531e618e0e1f9fc 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) diff --git a/upstream-info/gnu-free-fonts.yaml b/upstream-info/gnu-free-fonts.yaml index 05e75a6ed11096118dfaff605f90fd367acff43d..48ad14742fecd0a5ee25820d2839ec7864323b7c 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: . diff --git a/upstream-info/netpbm.yaml b/upstream-info/netpbm.yaml index fc6523cf801d70603a9fc93e9548d335f6464a9b..b4dcc7793680d22d94a961fcab356ad35bd101a1 100644 --- a/upstream-info/netpbm.yaml +++ b/upstream-info/netpbm.yaml @@ -2,4 +2,4 @@ version_control: svn src_repo: https://svn.code.sf.net/p/netpbm/code tag_dir: release_number tag_prefix: ^v -separator: . +separator: . \ No newline at end of file diff --git a/upstream-info/pcre.yaml b/upstream-info/pcre.yaml index 4f8d561c2aab4fd8e4a1f643d11a5abb5f2a6a0f..aa8c3914d5462122c0bfa66ed06ee180bfc859d8 100644 --- a/upstream-info/pcre.yaml +++ b/upstream-info/pcre.yaml @@ -1,4 +1,4 @@ version_control: svn -src_repo: svn://vcs.pcre.org/pcre/code/trunk +src_repo: svn://vcs.pcre.org/pcre/code tag_prefix: pcre- seperator: . diff --git a/upstream-info/postgresql-odbc.yaml b/upstream-info/postgresql-odbc.yaml index 4053ddb75de5576fc405a3dc6cde2559c3338acd..58d4cb41d42da50a6c14cbbd97b378b2b575b711 100644 --- a/upstream-info/postgresql-odbc.yaml +++ b/upstream-info/postgresql-odbc.yaml @@ -1,4 +1,4 @@ version_control: git -src_repo: https://git.postgresql.org/gitweb/?p=psqlodbc.git -tag_prefix: "^v" -seperator: "." +src_repo: https://git.postgresql.org/git/psqlodbc.git +tag_prefix: "^REL-" +seperator: "_" diff --git a/upstream-info/psacct.yaml b/upstream-info/psacct.yaml index 07c767a511157ebb8754aefe2788cae08d230d13..75eedd6fb0655a874ffb9b6129b08052c11488a0 100644 --- a/upstream-info/psacct.yaml +++ b/upstream-info/psacct.yaml @@ -1,4 +1,5 @@ -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: "." +svn_url: http://svn.savannah.gnu.org/svn/acct/