[cig-commits] r21916 - in cs/buildbot/trunk/buildbot: slave steps

[brad at geodynamics.org]

Author: brad
Date: 2013-04-19 16:36:34 -0700 (Fri, 19 Apr 2013)
New Revision: 21916

Modified:
   cs/buildbot/trunk/buildbot/slave/commands.py
   cs/buildbot/trunk/buildbot/steps/source.py
Log:
Fixed small bugs in getting git working with PETSc (need branch and cloning to working directory).

Modified: cs/buildbot/trunk/buildbot/slave/commands.py
===================================================================
--- cs/buildbot/trunk/buildbot/slave/commands.py	2013-04-19 21:57:36 UTC (rev 21915)
+++ cs/buildbot/trunk/buildbot/slave/commands.py	2013-04-19 23:36:34 UTC (rev 21916)
@@ -1733,6 +1733,7 @@
     def setup(self, args):
         SourceBase.setup(self, args)
         self.repourl = args['repourl']
+        self.branch = args['branch']
         #self.sourcedata = "" # TODO
 
     def sourcedirIsUpdateable(self):
@@ -1753,7 +1754,10 @@
     def doVCFull(self):
         d = os.path.join(self.builder.basedir, self.srcdir)
         os.mkdir(d)
-        command = ['git', 'clone', self.repourl]
+        if self.branch:
+            command = ['git', 'clone', '--branch', self.branch, self.repourl, '.']
+        else:
+            command = ['git', 'clone', self.repourl, '.']
         c = ShellCommand(self.builder, command, d,
                          sendRC=False, timeout=self.timeout)
         self.command = c

Modified: cs/buildbot/trunk/buildbot/steps/source.py
===================================================================
--- cs/buildbot/trunk/buildbot/steps/source.py	2013-04-19 21:57:36 UTC (rev 21915)
+++ cs/buildbot/trunk/buildbot/steps/source.py	2013-04-19 23:36:34 UTC (rev 21916)
@@ -586,7 +586,7 @@
                               to use if the Build does not specify one
                               explicitly. It will simply be appended to
                               C{baseURL} and the result handed to the
-                              'hg clone' command.
+                              'git clone' command.
         """
         self.repourl = repourl
         self.baseURL = baseURL
@@ -615,6 +615,7 @@
         self.description.extend(revstuff)
         self.descriptionDone.extend(revstuff)
 
+        print "REMOTE COMMAND args", self.args
         cmd = LoggedRemoteCommand("git", self.args)
         self.startCommand(cmd)