Improved handling of role_version in repo_url_to_role_name

lib/ansible/utils/__init__.py

@@ -356,6 +356,8 @@ def repo_url_to_role_name(repo_url):
     trailing_path = repo_url.split('/')[-1]
     if trailing_path.endswith('.git'):
         trailing_path = trailing_path[:-4]
+    if ',' in trailing_path:
+        trailing_path = trailing_path.split(',')[0]
     return trailing_path
 
 def json_loads(data):

test/units/TestUtils.py

@@ -780,6 +780,7 @@ class TestUtils(unittest.TestCase):
 
     def test_repo_url_to_role_name(self):
         tests = [("http://git.example.com/repos/repo.git", "repo"),
-                 ("ssh://git@git.example.com:repos/role-name", "role-name")]
+                 ("ssh://git@git.example.com:repos/role-name", "role-name"),
+                 ("ssh://git@git.example.com:repos/role-name,v0.1", "role-name")]
         for (url, result) in tests:
             self.assertEqual(ansible.utils.repo_url_to_role_name(url), result)