Modified: - get basename of svn module with regular expression

14e4970d · Robert Jensch · 3db6af8e · 14e4970d
Commit 14e4970d authored Sep 21, 2017 by Robert Jensch
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

path.py hdlmake/util/path.py +4 -4

No files found.
--- a/hdlmake/util/path.py
+++ b/hdlmake/util/path.py
@@ -25,6 +25,7 @@
 from __future__ import print_function
 from __future__ import absolute_import
 import os
+import re


 def url_parse(url):
@@ -75,11 +76,10 @@ def svn_basename(url):
    """
    Get basename from an SVN url
    """
-    words = url.split('//')
+    m = re.search(r'\/([^\/]*)\/(trunk|tags|branches)', url)
    try:
-        words = words[1].split('/')
-        return '/'.join(words[1:])
-    except IndexError:
+        return m.group(1)
+    except AttributeError:
        return None