Ticket #97: buildbot-svn-switch.patch

buildbot-0.7.5/buildbot/slave/commands.py

@@ -1444 +1444 @@
-        self.svnurl = args['svnurl']
-        self.sourcedata = "%s\n" % self.svnurl
-
+    def sourcedataMatches(self):
+        """We're using svn switch, so we can always change our url"""
+        return True
+
+    def writeSourcedata(self, res):
+        """We're using svn switch, so we can always change our url, no need to
+        track this in a file."""
+        return res
+
-    def sourcedirIsUpdateable(self):
-        if os.path.exists(os.path.join(self.builder.basedir,
-                                       self.srcdir, ".buildbot-patched")):
@@ -1455 +1464 @@
-        revision = self.args['revision'] or 'HEAD'
-        # update: possible for mode in ('copy', 'update')
-        d = os.path.join(self.builder.basedir, self.srcdir)
-update
-
+switch
+, self.svnurl
-        c = ShellCommand(self.builder, command, d,
-                         sendRC=False, timeout=self.timeout,
-                         keepStdout=True)