Merge branch 'source-method-copy-srcdir' of git://github.com/jpommere…

…ning/buildbot
buildbot · Oct 20, 2013 · ecb830b · ecb830b
2 parents 9dbcb9f + 209e30b
commit ecb830b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/master/buildbot/steps/source/cvs.py b/master/buildbot/steps/source/cvs.py
@@ -143,19 +143,20 @@ def copy(self):
                                                 'logEnviron': self.logEnviron})
         cmd.useLog(self.stdio_log, False)
         d = self.runCommand(cmd)        
-        self.workdir = 'source'
+        old_workdir = self.workdir
+        self.workdir = self.srcdir
         d.addCallback(lambda _: self.incremental())
         def copy(_):
             cmd = buildstep.RemoteCommand('cpdir',
-                                          {'fromdir': 'source',
-                                           'todir':'build',
+                                          {'fromdir': self.srcdir,
+                                           'todir': old_workdir,
                                            'logEnviron': self.logEnviron,})
             cmd.useLog(self.stdio_log, False)
             d = self.runCommand(cmd)
             return d
         d.addCallback(copy)
         def resetWorkdir(_):
-            self.workdir = 'build'
+            self.workdir = old_workdir
             return 0
         d.addCallback(resetWorkdir)
         return d

diff --git a/master/buildbot/steps/source/git.py b/master/buildbot/steps/source/git.py
@@ -120,6 +120,7 @@ def __init__(self, repourl=None, branch='HEAD', mode='incremental', method=None,
         self.getDescription = getDescription
         self.config = config
         self.supportsBranch = True
+        self.srcdir = 'source'
         Source.__init__(self, **kwargs)
 
         if self.mode not in ['incremental', 'full']:
@@ -244,20 +245,21 @@ def copy(self):
         cmd.useLog(self.stdio_log, False)
         d = self.runCommand(cmd)
 
-        self.workdir = 'source'
+        old_workdir = self.workdir
+        self.workdir = self.srcdir
         d.addCallback(lambda _: self.incremental())
         def copy(_):
             cmd = buildstep.RemoteCommand('cpdir',
-                                          {'fromdir': 'source',
-                                           'todir':'build',
+                                          {'fromdir': self.srcdir,
+                                           'todir': old_workdir,
                                            'logEnviron': self.logEnviron,
                                            'timeout': self.timeout,})
             cmd.useLog(self.stdio_log, False)
             d = self.runCommand(cmd)
             return d
         d.addCallback(copy)
         def resetWorkdir(_):
-            self.workdir = 'build'
+            self.workdir = old_workdir
             return 0
 
         d.addCallback(resetWorkdir)

diff --git a/master/buildbot/test/unit/test_steps_source_cvs.py b/master/buildbot/test/unit/test_steps_source_cvs.py
@@ -431,7 +431,7 @@ def test_mode_full_copy(self):
             ExpectShell(workdir='source',
                         command=['cvs', '-z3', 'update', '-dP'])
             + 0,
-            Expect('cpdir', {'fromdir': 'source', 'todir': 'build',
+            Expect('cpdir', {'fromdir': 'source', 'todir': 'wkdir',
                              'logEnviron': True})
             + 0,
             )
@@ -470,7 +470,7 @@ def test_mode_full_copy_wrong_repo(self):
                                  ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot',
                                  '-z3', 'checkout', '-d', 'source', 'mozilla/browser/'])
             + 0,
-            Expect('cpdir', {'fromdir': 'source', 'todir': 'build',
+            Expect('cpdir', {'fromdir': 'source', 'todir': 'wkdir',
                              'logEnviron': True})
             + 0,
             )

diff --git a/master/buildbot/test/unit/test_steps_source_git.py b/master/buildbot/test/unit/test_steps_source_git.py
@@ -1052,10 +1052,10 @@ def test_mode_full_copy(self):
             ExpectShell(workdir='source',
                         command=['git', 'reset', '--hard', 'FETCH_HEAD', '--'])
             + 0,
-            Expect('cpdir', {'fromdir': 'source', 'todir': 'build',
+            Expect('cpdir', {'fromdir': 'source', 'todir': 'wkdir',
                              'logEnviron': True, 'timeout': 1200})
             + 0,
-            ExpectShell(workdir='build',
+            ExpectShell(workdir='wkdir',
                         command=['git', 'rev-parse', 'HEAD'])
             + ExpectShell.log('stdio',
                 stdout='f6ad368298bd941e934a41f3babc827b2aa95a1d')

diff --git a/master/docs/relnotes/index.rst b/master/docs/relnotes/index.rst
@@ -117,6 +117,11 @@ Features
 
 * :bb:step:`CVS` source step now checks for "sticky dates" from a previous checkout before updating an existing source directory.
 
+Fixes
+~~~~~
+
+* Fixed and Issue where the Git and CVS source steps silently changed the ``workdir`` to ``'build'`` when the 'copy' method is used.
+
 Deprecations, Removals, and Non-Compatible Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~