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

[Brian Warner]

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

Modified Files:
	startup.py 
Log Message:
[project @ fix win32-vs-twisted-2.5.0 twistd.run behavior. Closes #53.]

Original author: warner at lothar.com
Date: 2007-12-08 20:19:22+00:00

Index: startup.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/startup.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- startup.py	29 Sep 2007 21:23:12 -0000	1.6
+++ startup.py	8 Dec 2007 20:20:37 -0000	1.7
@@ -105,8 +105,12 @@
             argv.append("--reactor=win32")
         sys.argv = argv
 
-        # this is copied from bin/twistd. twisted-2.0.0 uses _twistw.
-        if platformType == "win32":
+        # 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.scripts import _twistw
             run = _twistw.run
         else: