[Buildbot-commits] buildbot/buildbot/scripts tryclient.py,1.14,1.15

Brian Warner warner at users.sourceforge.net
Fri May 19 07:44:24 UTC 2006


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

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

clean up timezone-string usage

	* buildbot/scripts/tryclient.py (CVSExtractor.getBaseRevision):
	use a timezone string of +0000 and gmtime, since this timestamp is
	sent to a buildmaster and %z is broken.

	* buildbot/test/test_vc.py (CVSHelper.getdate): use no timezone
	string and localtime, since this timestamp will only be consumed
	locally, and %z is broken.

	* buildbot/slave/commands.py (CVS.parseGotRevision): use +0000 and
	gmtime, since this timestamp is returned to the buildmaster, and
	%z is broken.


Index: tryclient.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/tryclient.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tryclient.py	1 May 2006 00:10:57 -0000	1.14
+++ tryclient.py	19 May 2006 07:44:21 -0000	1.15
@@ -44,9 +44,11 @@
     patchlevel = 0
     vcexe = "cvs"
     def getBaseRevision(self):
-        # this depends upon our local clock and the repository's clock pretty
-        # in reasonable sync with each other
-        self.baserev = time.strftime("%Y-%m-%d %H:%M:%S %z",
+        # this depends upon our local clock and the repository's clock being
+        # reasonably synchronized with each other. We express everything in
+        # UTC because the '%z' format specifier for strftime doesn't always
+        # work.
+        self.baserev = time.strftime("%Y-%m-%d %H:%M:%S +0000",
                                      time.gmtime(now()))
         return defer.succeed(None)
 





More information about the Commits mailing list