[Buildbot-commits] buildbot/buildbot/changes maildir.py,1.6,1.7

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/changes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30527/buildbot/changes

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

tolerate dnotify flag problems on 64-bit systems

	* buildbot/changes/maildir.py (Maildir.start): Tolerate
	OverflowError when setting up dnotify, because some 64-bit systems
	have problems with signed-vs-unsigned constants and trip up on the
	DN_MULTISHOT flag. Patch from Brad Hards.

--This line, and those below, will be ignored--
Files to commit:
   <can't compute list>

This list might be incomplete or outdated if editing the log
message was not invoked from an up-to-date changes buffer!


Index: maildir.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/maildir.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- maildir.py	10 Aug 2005 07:06:11 -0000	1.6
+++ maildir.py	2 Oct 2005 23:25:10 -0000	1.7
@@ -52,8 +52,10 @@
             try:
                 self.dnotify = DNotify(self.newdir, self.dnotify_callback,
                                        [DNotify.DN_CREATE])
-            except IOError:
-                # probably linux<2.4.19, which doesn't support dnotify
+            except (IOError, OverflowError):
+                # IOError is probably linux<2.4.19, which doesn't support
+                # dnotify. OverflowError will occur on some 64-bit machines
+                # because of a python bug
                 print "DNotify failed, falling back to polling"
                 have_dnotify = 0