[Buildbot-commits] buildbot/buildbot/slave commands.py,1.50,1.51

Brian Warner warner at users.sourceforge.net
Mon May 22 18:02:34 UTC 2006


Update of /cvsroot/buildbot/buildbot/buildbot/slave
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28104/buildbot/slave

Modified Files:
	commands.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-565
Creator:  Brian Warner <warner at lothar.com>

give the WC_PATH option to svnversion, for older versions of SVN

	(SVN.parseGotRevision): oops, older verisons of 'svnversion'
	require the WC_PATH argument, so run 'svnversion .' instead.


Index: commands.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/commands.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- commands.py	22 May 2006 17:34:42 -0000	1.50
+++ commands.py	22 May 2006 18:02:32 -0000	1.51
@@ -1017,7 +1017,9 @@
         # svn update operations finish the line 'At revision 16654.'
         # But we don't use those. Instead, run 'svnversion'.
         svnversion_command = getCommand("svnversion")
-        command = [svnversion_command]
+        # older versions of 'svnversion' (1.1.4) require the WC_PATH
+        # argument, newer ones (1.3.1) do not.
+        command = [svnversion_command, "."]
         c = ShellCommand(self.builder, command,
                          os.path.join(self.builder.basedir, self.srcdir),
                          environ=self.env,





More information about the Commits mailing list