[Blends-commit] [SCM] website branch, master, updated. 41cb3138a5489bb24a977f3b803fba8e6fa455ff

[Andreas Tille]

The following commit has been merged in the master branch:
commit 41cb3138a5489bb24a977f3b803fba8e6fa455ff
Author: Andreas Tille <tille at debian.org>
Date:   Mon Feb 5 15:20:27 2018 +0100

    Detect VCS when URL points to Salsa

diff --git a/webtools/blendstasktools.py b/webtools/blendstasktools.py
index b55bcc6..0bb1dbe 100644
--- a/webtools/blendstasktools.py
+++ b/webtools/blendstasktools.py
@@ -704,7 +704,7 @@ def BrowserFromVcsURL(vcs_type, vcs_url):
 detect_vcs_cvs_re        = re.compile("://.*cvs")
 detect_vcs_svn_re        = re.compile("://.*svn")
 detect_vcs_git_re        = re.compile("://.*git")
-
+detect_vcs_salsa_re      = re.compile("://.*salsa")
 
 def VcsTypeFromBrowserURL(vcs_browser):
     # Guess Vcs-Type from vcs_browser
@@ -714,6 +714,8 @@ def VcsTypeFromBrowserURL(vcs_browser):
         return 'Svn'
     if detect_vcs_git_re.search(vcs_browser):
         return 'Git'
+    if detect_vcs_salsa_re.search(vcs_browser):
+        return 'Git'
     return 'Unknown VCS'
 
 # The following keys will be mostly used for programs that
diff --git a/webtools/blendstasktools_udd.py b/webtools/blendstasktools_udd.py
index a2b33e5..9727d01 100644
--- a/webtools/blendstasktools_udd.py
+++ b/webtools/blendstasktools_udd.py
@@ -644,6 +644,7 @@ def BrowserFromVcsURL(vcs_type, vcs_url):
 detect_vcs_cvs_re        = re.compile("://.*cvs")
 detect_vcs_svn_re        = re.compile("://.*svn")
 detect_vcs_git_re        = re.compile("://.*git")
+detect_vcs_salsa_re      = re.compile("://.*salsa")
 
 
 def VcsTypeFromBrowserURL(vcs_browser):
@@ -654,6 +655,8 @@ def VcsTypeFromBrowserURL(vcs_browser):
         return 'Svn'
     if detect_vcs_git_re.search(vcs_browser):
         return 'Git'
+    if detect_vcs_salsa_re.search(vcs_browser):
+        return 'Git'
     return 'Unknown VCS'
 
 # The following keys will be mostly used for programs that

-- 
Static and dynamic websites for Debian Pure Blends