Make sure an updated git URL is used

[mass-build.git] / vcs.py

diff --git a/vcs.py b/vcs.py
index b2387c7f53eb65e2207a9577bdb613652a7ffde0..e30d31a9cb4d24e02483ea0cd261ae7eb4544267 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -24,6 +24,7 @@ class Git:
                        # load existing repo
                        repo = git.Repo(self.folder)
                        origin = repo.remotes.origin
                        # load existing repo
                        repo = git.Repo(self.folder)
                        origin = repo.remotes.origin

+                       origin.config_writer.set_value("url", self.url) # make sure we use the current URL

                else:
                        # create a new one
                        os.makedirs(self.folder)
                else:
                        # create a new one
                        os.makedirs(self.folder)


@@ -54,17 +55,17 @@ class Git:
 
 # Fetch updates via SVN
 class SVN:
 
 # Fetch updates via SVN
 class SVN:

-       def __init__(self, folder, svnPath, versionName):
+       def __init__(self, folder, url, versionName):

                self.folder = os.path.abspath(folder)
                self.folder = os.path.abspath(folder)

-               self.svnPath = svnPath
+               self.url = url

                self.versionName = versionName
 
        def update(self):
                if os.path.exists(self.folder):
                        os.chdir(self.folder) # go into repository
                self.versionName = versionName
 
        def update(self):
                if os.path.exists(self.folder):
                        os.chdir(self.folder) # go into repository

-                       subprocess.check_call(['svn', 'switch', self.svnPath]) # and update to the URL we got
+                       subprocess.check_call(['svn', 'switch', self.url]) # and update to the URL we got

                else:
                else:

-                       subprocess.check_call(['svn', 'co', self.svnPath, self.folder])# just download it
+                       subprocess.check_call(['svn', 'co', self.url, self.folder]) # just download it

 
        def version(self):
                return self.versionName
 
        def version(self):
                return self.versionName