Forward section parameter to auto-debuild

[mass-build.git] / vcs.py

diff --git a/vcs.py b/vcs.py
index 9c91e933654d0326f2c06d31f8a1be0f4a8a4600..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
+                       origin.config_writer.set_value("url", self.url) # make sure we use the current URL
                else:
                        # create a new one
                        os.makedirs(self.folder)
@@ -52,37 +53,19 @@ class Git:
                if v.startswith('v'): v = v[1:]
                return v
 
-       def ignore(self, name):
-               with open(os.path.join(self.folder, '.git', 'info', 'exclude'), 'r+') as f:
-                       for line in f:
-                               line = line.replace('\n', '').replace('\r', '')
-                               if line == name: return # is already ignored
-                       print >>f, name # add ignore line
-
-class KDEGit(Git):
-       def __init__(self, folder, name, commit):
-               Git.__init__(self, folder, 'kde:'+name, commit)
-
 # 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.svnPath = svnPath
+               self.url = url
                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:
-                       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 ignore(self, name):
-               pass
-
-class KDESVN(SVN):
-       def __init__(self, folder, svnPath, version):
-               SVN.__init__(self, folder, 'svn://svn.kde.org/home/kde/'+svnPath, version)