[Buildbot-commits] buildbot/buildbot/scripts startup.py,1.7,1.8

Brian Warner warner at users.sourceforge.net
Wed Dec 12 03:02:15 UTC 2007


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

Modified Files:
	startup.py 
Log Message:
[project @ fix 'buildbot start' for twisted<2.4.0]

Original author: warner at lothar.com
Date: 2007-12-12 03:01:11+00:00

Index: startup.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/startup.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- startup.py	8 Dec 2007 20:20:37 -0000	1.7
+++ startup.py	12 Dec 2007 03:02:13 -0000	1.8
@@ -108,9 +108,11 @@
         # this is copied from bin/twistd. twisted-2.0.0 through 2.4.0 use
         # _twistw.run . Twisted-2.5.0 and later use twistd.run, even for
         # windows.
-        from twisted import version
-        if (platformType == "win32"
-            and (version.major == 2 and version.minor < 5)):
+        from twisted import __version__
+        major, minor, ignored = __version__.split(".", 2)
+        major = int(major)
+        minor = int(minor)
+        if (platformType == "win32" and (major == 2 and minor < 5)):
             from twisted.scripts import _twistw
             run = _twistw.run
         else:





More information about the Commits mailing list