Merge pull request ESCOMP#167 from billsacks/fix_svn_on_windows

Fix svn on Windows
billsacks · Apr 8, 2022 · 1d880e0 · 1d880e0
2 parents b1c02ab + 3510da8
commit 1d880e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/manic/repository_svn.py b/manic/repository_svn.py
@@ -43,10 +43,15 @@ def __init__(self, component_name, repo, ignore_ancestry=False):
         """
         Repository.__init__(self, component_name, repo)
         self._ignore_ancestry = ignore_ancestry
+        if self._url.endswith('/'):
+            # there is already a '/' separator in the URL; no need to add another
+            url_sep = ''
+        else:
+            url_sep = '/'
         if self._branch:
-            self._url = os.path.join(self._url, self._branch)
+            self._url = self._url + url_sep + self._branch
         elif self._tag:
-            self._url = os.path.join(self._url, self._tag)
+            self._url = self._url + url_sep + self._tag
         else:
             msg = "DEV_ERROR in svn repository. Shouldn't be here!"
             fatal_error(msg)

diff --git a/test/test_unit_repository_svn.py b/test/test_unit_repository_svn.py
@@ -60,7 +60,7 @@ def setUp(self):
         self._name = 'component'
         rdata = {ExternalsDescription.PROTOCOL: 'svn',
                  ExternalsDescription.REPO_URL:
-                     'https://svn-ccsm-models.cgd.ucar.edu/',
+                     'https://svn-ccsm-models.cgd.ucar.edu',
                  ExternalsDescription.TAG:
                      'mosart/trunk_tags/mosart1_0_26',
                  }