From 88d15481f17fb61ffa2708836a2dd576ab999a0a Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Tue, 30 Jun 2009 11:29:09 -0400 Subject: [PATCH] rename old extra_args in commands.py to svn_args to avoid confusion --- buildbot/slave/commands.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/buildbot/slave/commands.py b/buildbot/slave/commands.py index a25b8ee..210e009 100755 --- a/buildbot/slave/commands.py +++ b/buildbot/slave/commands.py @@ -1729,13 +1729,13 @@ class SVN(SourceBase): self.svnurl = args['svnurl'] self.sourcedata = "%s\n" % self.svnurl - self.extra_args = [] + self.svn_args = [] if args.has_key('username'): - self.extra_args.extend(["--username", args['username']]) + self.svn_args.extend(["--username", args['username']]) if args.has_key('password'): - self.extra_args.extend(["--password", Obfuscated(args['password'], "XXXX")]) + self.svn_args.extend(["--password", Obfuscated(args['password'], "XXXX")]) if args.get('extra_args', None) is not None: - self.extra_args.extend(args['extra_args']) + self.svn_args.extend(args['extra_args']) def sourcedirIsUpdateable(self): if os.path.exists(os.path.join(self.builder.basedir, @@ -1749,7 +1749,7 @@ class SVN(SourceBase): # update: possible for mode in ('copy', 'update') d = os.path.join(self.builder.basedir, self.srcdir) command = [self.vcexe, 'update'] + \ - self.extra_args + \ + self.svn_args + \ ['--revision', str(revision), '--non-interactive', '--no-auth-cache'] c = ShellCommand(self.builder, command, d, @@ -1763,14 +1763,14 @@ class SVN(SourceBase): d = self.builder.basedir if self.mode == "export": command = [self.vcexe, 'export'] + \ - self.extra_args + \ + self.svn_args + \ ['--revision', str(revision), '--non-interactive', '--no-auth-cache', self.svnurl, self.srcdir] else: # mode=='clobber', or copy/update on a broken workspace command = [self.vcexe, 'checkout'] + \ - self.extra_args + \ + self.svn_args + \ ['--revision', str(revision), '--non-interactive', '--no-auth-cache', self.svnurl, self.srcdir] -- 2.11.4.GIT