Ticket #41: buildbot-svn-passwd.patch

buildbot-0.7.5/slave/commands.py

@@ -1434 +1434 @@
-    handled by SourceBase, this command reads the following keys:
-
-    ['svnurl'] (required): the SVN repository string
+    ['username']    Username passed to the svn command
+    ['password']    Password passed to the svn command
-    """
-
-    header = "svn operation"
@@ -1443 +1445 @@
-        self.vcexe = getCommand("svn")
-        self.svnurl = args['svnurl']
-        self.sourcedata = "%s\n" % self.svnurl
+        self.username = args.get("username", None)
+        self.password = args.get("password", None)
-
-    def sourcedirIsUpdateable(self):
-        if os.path.exists(os.path.join(self.builder.basedir,
@@ -1457 +1461 @@
-        d = os.path.join(self.builder.basedir, self.srcdir)
-        command = [self.vcexe, 'update', '--revision', str(revision),
-                   '--non-interactive']
+        if self.username:
+            command += ['--username', self.username]
+        if self.password:
+            command += ['--password', self.password]
-        c = ShellCommand(self.builder, command, d,
-                         sendRC=False, timeout=self.timeout,
-                         keepStdout=True)
@@ -1468 +1476 @@
-        d = self.builder.basedir
-        if self.mode == "export":
-            command = [self.vcexe, 'export', '--revision', str(revision),
-
-
+
-        else:
-            # mode=='clobber', or copy/update on a broken workspace
-            command = [self.vcexe, 'checkout', '--revision', str(revision),
-
-
+
+
+
+
+
+
-        c = ShellCommand(self.builder, command, d,
-                         sendRC=False, timeout=self.timeout,
-                         keepStdout=True)

buildbot-0.7.5/steps/source.py

@@ -379 +379 @@
-        self.svnurl = svnurl
-        self.baseURL = baseURL
-        self.branch = defaultBranch
+        self.username = kwargs.get("username")        
+        if "username" in kwargs:
+            del kwargs["username"]
+        self.password = kwargs.get("password")
+        if "password" in kwargs:
+            del kwargs["password"]
-
-        Source.__init__(self, **kwargs)
-
@@ -450 +456 @@
-            self.args['svnurl'] = self.baseURL + branch
-        self.args['revision'] = revision
-        self.args['patch'] = patch
+        if self.username:
+            self.args['username'] = self.username
+        if self.password:
+            self.args['password'] = self.password
-
-        revstuff = []
-        if branch is not None and branch != self.branch: