diff --git a/advisors/check_upstream.py b/advisors/check_upstream.py
index 6560e64e1407f59f209751bc0bc7074c92b8c42e..0ac0abf61cb9cd019bafb80e8baaf4bd56984539 100755
--- a/advisors/check_upstream.py
+++ b/advisors/check_upstream.py
@@ -363,10 +363,15 @@ def __get_git_tag_list(git_repo):
     cmd_list = ["git", "tag", '-l']
     resp = __check_subprocess(cmd_list)
     for version in resp.splitlines():
+        if version == '-' or version == 'CHANGES':
+            continue
         cmd_list = ['git', 'log', '-1', '--format=%ai', version]
         date_resp = __check_subprocess(cmd_list)
-        date = datetime.strptime(date_resp.split(" ")[0], "%Y-%m-%d")
-        tag_date[version] = date
+        if not date_resp:
+            tag_date[version] = None
+        else:
+            date = datetime.strptime(date_resp.split(" ")[0], "%Y-%m-%d")
+            tag_date[version] = date
     return tag_date
 
 
@@ -380,9 +385,15 @@ def __check_git_helper(repo_url):
     else:
         os.mkdir("git")
         os.chdir("git")
+    if repo_url[-1] == '/':
+        repo_url = repo_url[0:-1]
+    if repo_url.endswith(".git"):
+        git_repo_list = os.path.basename(repo_url).split('.')[0:-1]
+        git_repo = ".".join(git_repo_list)
+    else:
+        git_repo_list = os.path.basename(repo_url)
+        git_repo = git_repo_list
 
-    git_repo_list = os.path.basename(repo_url).split('.')[0:-1]
-    git_repo = ".".join(git_repo_list)
     zip_file = git_repo + ".zip"
     if os.path.isfile(zip_file):
         shutil.unpack_archive(zip_file, git_repo)
@@ -429,11 +440,17 @@ def __svn_resp_to_tags(resp):
     """
     tags = {}
     for line in resp.splitlines():
+        if 'Redirecting' in line:
+            continue
         items = line.split()
-        create_date = items[2]
-        tag = items[3]
+        create_date = items[2:5]
+        tag = items[5]
         tag = tag[:-1]
-        tags[tag] = datetime.strptime(create_date, "%Y-%m-%d")
+        try:
+            date = datetime.strptime(",".join(create_date), "%b,%d,%Y")
+            tags[tag] = date
+        except ValueError:
+            tags[tag]=None
 
     return tags
 
@@ -455,10 +472,11 @@ def check_git(info, clean_tag=True):
         tag_data = __check_git_helper(url)
         last_query = {"time_stamp": datetime.now(), "raw_data": tag_data}
         info["last_query"] = last_query
-
     if tag_data:
         tags = clean_tags(tag_data, info)
-    return tags
+        return tags
+    else:
+        return None
 
 
 def check_github(info, clean_tag=True):
diff --git a/advisors/oa_upgradable.py b/advisors/oa_upgradable.py
index 3b83eb174e8380cfd2d2644e97c999257427edc5..74234c8eba4ba24d7d755b7d7d374832003cd88d 100755
--- a/advisors/oa_upgradable.py
+++ b/advisors/oa_upgradable.py
@@ -47,8 +47,10 @@ def _filter_except(excpts, sources):
     """
     Filter except case in sources
     """
+    if not sources:
+        return sources
     for exp in excpts:
-        for source in sources.keys():
+        for source in list(sources):
             result = re.fullmatch(exp, source)
             if result:
                 sources.pop(source)
@@ -166,11 +168,13 @@ def main_process(push, default, repo):
 
     print("Current version is", cur_version)
     pkg_tags = get_ver_tags(user_gitee, repo, cwd_path=default)
+    if not pkg_tags:
+        print("No release tags get, please check", repo)
+        return None
+
     print("known release tags:", list(pkg_tags.keys()))
     url = get_ver_url(user_gitee, repo, cwd_path=default)
 
-    if not pkg_tags:
-        return None
 
     if cur_version not in pkg_tags.keys():
         print("WARNING: Current {ver} doesn't exist in upstream." \
diff --git a/upstream-info/cbi-plugins.yaml b/upstream-info/cbi-plugins.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f1eaa62da640965bfa81350d7d89ad1a8ea59295
--- /dev/null
+++ b/upstream-info/cbi-plugins.yaml
@@ -0,0 +1,5 @@
+version_control: git
+src_repo: https://git.eclipse.org/r/www.eclipse.org/cbi.git
+tag_prefix: "org.eclipse.cbi.maven.plugins_maven-plugin-parent_"
+separator: "."
+git_url: https://git.eclipse.org/r/www.eclipse.org/cbi.git
diff --git a/upstream-info/clutter-gst.yaml b/upstream-info/clutter-gst.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/upstream-info/clutter-gst3.yaml b/upstream-info/clutter-gst3.yaml
index 9f6cbdedf24166aeccf9e62588d12668b816a946..497b20e85b53126c72a1b190805ee38ce109719b 100644
--- a/upstream-info/clutter-gst3.yaml
+++ b/upstream-info/clutter-gst3.yaml
@@ -1,58 +1,5 @@
----
-version_control: github
-src_repo: GNOME/clutter-gst
-tag_prefix: "^v"
-separator: "."
-git_url: https://github.com/GNOME/clutter-gst.git
-git_tag:
-- 2019-02-06 3.0.27
-- 2018-03-10 3.0.26
-- 2017-03-29 3.0.24
-- 2016-12-06 3.0.22
-- 2016-09-08 3.0.20
-- 2016-03-20 3.0.18
-- 2016-03-20 2.0.18
-- 2016-02-12 3.0.16
-- 2015-10-10 3.0.14
-- 2015-09-30 3.0.12
-- 2015-09-04 3.0.10
-- 2015-07-18 3.0.8
-- 2015-05-24 2.0.16
-- 2015-05-24 3.0.6
-- 2015-01-25 2.0.14
-- 2015-01-24 3.0.4
-- 2015-01-11 3.0.2
-- 2014-12-06 3.0.0
-- 2014-06-26 2.99.4
-- 2014-06-09 2.99.2
-- 2014-06-01 2.0.12
-- 2014-01-10 2.0.10
-- 2013-11-19 2.99.0
-- 2013-09-18 2.0.8
-- 2013-07-23 2.0.6
-- 2013-05-24 2.0.4
-- 2013-02-26 2.0.2
-- 2013-01-22 2.0.0
-- 2012-09-26 1.9.92
-- 2012-08-22 1.9.90
-- 2012-06-25 1.6.0
-- 2012-05-25 1.5.6
-- 2012-02-24 1.5.4
-- 2012-01-25 1.5.2
-- 2012-01-18 1.4.6
-- 2011-10-27 1.4.4
-- 2011-10-03 1.4.2
-- 2011-09-30 1.4.0
-- 2011-08-31 1.3.14
-- 2011-06-06 1.3.12
-- 2011-05-09 1.3.10
-- 2011-04-05 1.3.8
-- 2011-03-02 1.3.6
-- 2011-01-10 1.3.4
-- 2010-09-20 1.3.2
-- 2010-08-18 1.2.0
-- 2010-02-09 1.0.0
-- 2009-07-29 0.10.0
-- 2009-07-24 0.9.0
-- 2008-07-18 0.8.0
-- 2008-02-18 0.6.0
+version_control: git
+src_repo: https://gitlab.gnome.org/Archive/clutter-gst.git
+tag_prefix: ""
+separator: .
+url: https://gitlab.gnome.org/Archive/clutter-gst.git
diff --git a/upstream-info/debugedit.yaml b/upstream-info/debugedit.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b4d47a00e97c8471090f6e81ff875caa92d5f38a
--- /dev/null
+++ b/upstream-info/debugedit.yaml
@@ -0,0 +1,4 @@
+version_control: ftp
+src_repo: https://sourceware.org/ftp/debugedit
+tag_prefix: "^v" 
+seperator: "."
diff --git a/upstream-info/libmbim.yaml b/upstream-info/libmbim.yaml
index 5b046b0a68c67660deea5e7ccbdee9ef783abd25..109c496dd2c8a7269bae51bb206e40c4a6c68a4c 100644
--- a/upstream-info/libmbim.yaml
+++ b/upstream-info/libmbim.yaml
@@ -1,10 +1,5 @@
----
-version_control: github
-src_repo: freedesktop/libmbim
-tag_prefix: "^"
+version_control: git
+src_repo: https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
+tag_prefix: ""
 separator: "."
-git_url: https://github.com/freedesktop/libmbim.git
-git_tag:
-- 2020-06-18 1.24.0
-- 2020-05-27 1.24-rc1
-- 2020-01-15 1.22.0
+git_url: https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
diff --git a/upstream-info/libqmi.yaml b/upstream-info/libqmi.yaml
index 702ef26dadddc82585f7c96545ca05b1ee92bc2d..fbbb21c92bba8f7dde5a618ea96be3cb99dda7f3 100644
--- a/upstream-info/libqmi.yaml
+++ b/upstream-info/libqmi.yaml
@@ -1,9 +1,6 @@
 ---
-version_control: github
-src_repo: freedesktop/libqmi
+version_control: git
+src_repo: https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
 tag_prefix: "^"
 separator: "."
-git_url: https://github.com/freedesktop/libqmi.git
-git_tag:
-- 2020-06-20 1.26.0
-- 2020-05-30 1.26-rc1
+git_url: https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
diff --git a/upstream-info/multipath-tools.yaml b/upstream-info/multipath-tools.yaml
index 70a1a78224f9b385a6bc10d5fc7f7c245f48b97b..46a6f24ac47cf4f1f411335cbac80c76f80efe6a 100644
--- a/upstream-info/multipath-tools.yaml
+++ b/upstream-info/multipath-tools.yaml
@@ -1,9 +1,6 @@
 ---
-version_control: git
-src_repo: https://git.opensvc.com/multipath-tools/.git
+version_control: github
+src_repo: opensvc/multipath-tools
 tag_prefix: "^v"
 separator: "."
-last_query:
-  time_stamp: 2020-04-26 08:12:49.195752200 +00:00
-  raw_data: "0803439535ea30ad1951d3deb0c5eaf894470d43\trefs/tags/0.4.5\nbc7d48460a83b91468c91ee8710cfc33ba03fa4e\trefs/tags/0.4.5-pre3\n48994c1b64fac2f9bb9ce4de6bfb4a03b242a023\trefs/tags/0.4.5-pre4\nee9d9d064ff606d6bb0abcd04410c32cc0818ab7\trefs/tags/0.4.6\n10e6df5b340f6f9f31284252fbe6221ffac21a8e\trefs/tags/0.4.7\na9033a808dd377da6605660dfc245a82057254cc\trefs/tags/0.4.8\n17f14138e13b3ecbb37b86199739072f2c44c1a2\trefs/tags/0.4.9\n82f391e787dc02e9d9294aa391137ab424bb83c4\trefs/tags/0.5.0\nb21c567961f518810a1ac3b209c8db45f6dbac2c\trefs/tags/0.6.0\nec56ef2052a9ba1e0fde301cd808452b2ac1a097\trefs/tags/0.6.1\ne165b73a16fc9027aa3306df40052038c175be1b\trefs/tags/0.6.2\n88d526b48a85794761221422913cff608557856c\trefs/tags/0.6.3\n922421cf795d53d339862bb2d99f1a85c96ad9a3\trefs/tags/0.6.4\nfadb66a8935e1b2adff74ae53eac1dcc147db4f8\trefs/tags/0.7.0\nbe1191b1d2726ed94498dac3505ca455bb6cb64e\trefs/tags/0.7.1\n888735d20d6ae6f5b4363a2aa750d97174aac3ee\trefs/tags/0.7.2\na0e0752fbf08832f9d06431f05d5303750733ead\trefs/tags/0.7.3\n909031d7a562fcb224b5d3c71580268a09fb49a2\trefs/tags/0.7.4\n30cda49eb230359438e6f256f6abc08fcf04582d\trefs/tags/0.7.5\n8c97fdc32299056a57d6e530753c7bb18bdfb5da\trefs/tags/0.7.6\n386d288b5595fc2c01dffe698b6eb306c6674908\trefs/tags/0.7.7\n22b34f9fc40583a6171da6a53cebc6bb898e30ee\trefs/tags/0.7.8\n5c67a8b5944dd13542e6b44fa2ae9803e0cc4282\trefs/tags/0.7.9\neb688e1833e9533bfd9496ddc37eecc93590defa\trefs/tags/0.8.0\ne23b5d7cf67a9c543e118f2f6b902594a02a804a\trefs/tags/0.8.1\n8a7e9b6648898f2c2d2bbd2d22871f79612e716e\trefs/tags/0.8.2\n6c3bd369b23e959700527e0e2e6d5b2a1bd36294\trefs/tags/0.8.3\n"
-git_url: https://git.opensvc.com/multipath-tools/.git
+git_url: https://github.com/opensvc/multipath-tools.git
diff --git a/upstream-info/python-pep517.yaml b/upstream-info/python-pep517.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..bc4d14f2bfde4d6b3637bff02b8e895d57743ff1
--- /dev/null
+++ b/upstream-info/python-pep517.yaml
@@ -0,0 +1,5 @@
+version_control: github
+src_repo: OpenMandrivaAssociation/python-pep517
+tag_prefix: "^release-"
+separator: "."
+git_url: https://github.com/OpenMandrivaAssociation/python-pep517.git
diff --git a/upstream-info/qt5-qt3d.yaml b/upstream-info/qt5-qt3d.yaml
index c9f7503500ff3e59f67550cd960cdc3dec29835d..00de6db61f987fb9c714349b760d0ede7b007fa8 100644
--- a/upstream-info/qt5-qt3d.yaml
+++ b/upstream-info/qt5-qt3d.yaml
@@ -1,6 +1,5 @@
----
 version_control: git
-src_repo: https://code.qt.io/cgit/qt/qt3d.git/
+src_repo: https://code.qt.io/qt/qt3d.git
 tag_prefix: "^v"
 separator: "."
-git_url: https://code.qt.io/cgit/qt/qt3d.git/
+git_url: https://code.qt.io/qt/qt3d.git
diff --git a/upstream-info/rubygem-cucumber-expressions.yaml b/upstream-info/rubygem-cucumber-expressions.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a9b88c57ad068653d4c29e9aec126c0b8a408887
--- /dev/null
+++ b/upstream-info/rubygem-cucumber-expressions.yaml
@@ -0,0 +1,5 @@
+version_control: github
+src_repo: cucumber/cucumber-expressions
+tag_prefix: "^v"
+separator: "."
+
diff --git a/upstream-info/rubygem-daemons.yaml b/upstream-info/rubygem-daemons.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5dd62c250465fb30714bcbcbb68a2b0db36e9b06
--- /dev/null
+++ b/upstream-info/rubygem-daemons.yaml
@@ -0,0 +1,4 @@
+version_control: github
+src_repo: thuehlinger/daemons
+tag_prefix: "v"
+separator: "."
diff --git a/upstream-info/startup-notification.yaml b/upstream-info/startup-notification.yaml
index 124380209936427a433510488c251562faa5ee86..5d8a7aec5c4e54dc711f9e5020c58d2c29668047 100644
--- a/upstream-info/startup-notification.yaml
+++ b/upstream-info/startup-notification.yaml
@@ -1,17 +1,5 @@
----
-version_control: github
-src_repo: freedesktop/startup-notification
+version_control: git
+src_repo: https://gitlab.freedesktop.org/xdg/startup-notification.git
 tag_prefix: "^STARTUP_NOTIFICATION_"
-separator: _
-git_url: https://github.com/freedesktop/startup-notification.git
-git_tag:
-- 2011-05-16 STARTUP_NOTIFICATION_0_12
-- 2011-05-05 STARTUP_NOTIFICATION_0_11
-- 2009-04-13 STARTUP_NOTIFICATION_0_10
-- 2007-03-17 STARTUP_NOTIFICATION_0_9
-- 2004-11-10 STARTUP_NOTIFICATION_0_8
-- 2004-06-24 STARTUP_NOTIFICATION_0_7
-- 2003-01-21 STARTUP_NOTIFICATION_0_5
-- 2002-12-01 STARTUP_NOTIFICATION_0_4
-- 2002-10-29 STARTUP_NOTIFICATION_0_3
-- 2002-10-23 STARTUP_NOTIFICATION_0_2
+separator: "_"
+git_url: https://gitlab.freedesktop.org/xdg/startup-notification.git
diff --git a/upstream-info/weston.yaml b/upstream-info/weston.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0965e2cb2fe722f757522dd2483a3562d0d0ef05
--- /dev/null
+++ b/upstream-info/weston.yaml
@@ -0,0 +1,5 @@
+version_control: git
+src_repo: https://gitlab.freedesktop.org/wayland/weston.git
+tag_prefix: ""
+separator: "."
+git_url: https://gitlab.freedesktop.org/wayland/weston.git
diff --git a/upstream-info/xorg-x11-font-utils.yaml b/upstream-info/xorg-x11-font-utils.yaml
index e600d4b167963857e03a45830d0d2dd1db43ed7f..c651911c56ccada49514d416e1c41d268dc3695c 100644
--- a/upstream-info/xorg-x11-font-utils.yaml
+++ b/upstream-info/xorg-x11-font-utils.yaml
@@ -1,6 +1,4 @@
----
-version_control: github
-src_repo: eurolinux-enterprise-linux-sources/xorg-x11-font-utils
-tag_prefix: "^xorg-x11-font-utils-" 
-separator: "."
-git_url: https://github.com/eurolinux-enterprise-linux-sources/xorg-x11-font-utils.git
+version_control: NA
+src_repo: NA
+tag_prefix: NA
+separator: NA
diff --git a/upstream-info/xorg-x11-xkb-utils.yaml b/upstream-info/xorg-x11-xkb-utils.yaml
index 8a3f6147a6944a63f1a0c5ac355973891246d7cb..e25df7d87588fefc7f5af576519b76f1cdd0d280 100644
--- a/upstream-info/xorg-x11-xkb-utils.yaml
+++ b/upstream-info/xorg-x11-xkb-utils.yaml
@@ -1,6 +1,5 @@
----
-version_control: github
-src_repo: eurolinux-enterprise-linux-sources/xorg-x11-xkb-utils
-tag_prefix: "^xorg-x11-xkb-utils-" 
-separator: "."
-git_url: https://github.com/eurolinux-enterprise-linux-sources/xorg-x11-xkb-utils.git
+version_control: git
+src_repo: https://gitlab.freedesktop.org/xorg/app/xkbutils.git
+tag_prefix: ^xkbutils-
+seperator: .
+