give the module last on the cvs commandline

buildbot · May 19, 2012 · 0375655 · 0375655
1 parent 7226de5
commit 0375655
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/master/buildbot/steps/source/cvs.py b/master/buildbot/steps/source/cvs.py
@@ -162,13 +162,13 @@ def evaluate(rc):
         return d
 
     def doCheckout(self, dir):
-        command = ['-d', self.cvsroot, '-z3', 'checkout', '-d', dir,
-                   self.cvsmodule]
+        command = ['-d', self.cvsroot, '-z3', 'checkout', '-d', dir ]
         command = self.global_options + command + self.extra_options
         if self.branch:
             command += ['-r', self.branch]
         if self.revision:
             command += ['-D', self.revision]
+        command += [ self.cvsmodule ]
         d = self._dovccmd(command, '')
         return d
 

diff --git a/master/buildbot/test/unit/test_steps_source_cvs.py b/master/buildbot/test/unit/test_steps_source_cvs.py
@@ -415,7 +415,7 @@ def test_mode_incremental_with_options(self):
             ExpectShell(workdir='',
                         command=['cvs', '-q', '-d',
                                  ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot',
-                                 '-z3', 'checkout', '-d', 'wkdir', 'mozilla/browser/', '-l'])
+                                 '-z3', 'checkout', '-d', 'wkdir', '-l', 'mozilla/browser/'])
             + 0,
             )
         self.expectOutcome(result=SUCCESS, status_text=["update"])