!97 修复yaml bug和版本解析bug

Merge pull request !97 from Monday/master

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
 

advisors/helper/version_exceptions.yaml

@@ -23,3 +23,7 @@ sombok:
 shadow:
     - '1999'
     - '2000'
+gmp:
+    - '2v0v2'
+    - '2v0v1'
+    - '2v0'

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)
 

upstream-info/gnu-free-fonts.yaml

 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: .

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

upstream-info/pcre.yaml

 version_control: svn
-src_repo: svn://vcs.pcre.org/pcre/code/trunk
+src_repo: svn://vcs.pcre.org/pcre/code
 tag_prefix: pcre-
 seperator: .

upstream-info/postgresql-odbc.yaml

 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: "_"

upstream-info/psacct.yaml

-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/