[Zodb-checkins] CVS: Zope/lib/python/zdaemon - Daemon.py:1.11.6.3

[Jeremy Hylton]

Update of /cvs-repository/Zope/lib/python/zdaemon
In directory cvs.zope.org:/tmp/cvs-serv27252/lib/python/zdaemon

Modified Files:
      Tag: Zope-2_6-branch
	Daemon.py 
Log Message:
Sync Zope 2.6 and ZODB 3.1 release branches.

ZODB deadlock prevention code.
Bug in ConflictResolution bad_classes handling.
Don't let exceptions propagate out of ConflictResolution.
Add data_txn atribute to records returned by storage iterators.
Other sundry changes.



=== Zope/lib/python/zdaemon/Daemon.py 1.11.6.2 => 1.11.6.3 ===
--- Zope/lib/python/zdaemon/Daemon.py:1.11.6.2	Tue Oct  8 20:33:52 2002
+++ Zope/lib/python/zdaemon/Daemon.py	Tue Nov 12 16:13:59 2002
@@ -114,18 +114,12 @@
         signum = os.WTERMSIG(s)
         signame = get_signal_name(signum)
         msg = "terminated by signal %s(%s)" % (signame, signum)
-        # We'd like to report whether a core file
-        # was produced, but there isn't a standard
-        # way to check.  It seems that some
-        # (many?) Unixes use bit 0x80 in the wait
-        # status, but how to tell?  A simple
-        # alternative is to assume that no core
-        # file was produced if the wait status is
-        # exactly equal to the signal.  Otherwise,
-        # there might be a core file and it's
-        # useful to print the wait status.
-        if signum != s:
-            msg += ", wait status: %s" % signum
+        if hasattr(os, 'WCOREDUMP'):
+            iscore = os.WCOREDUMP(s)
+        else:
+            iscore = s & 0x80
+        if iscore:
+            msg += " (core dumped)"
     else:
         # XXX what should we do here?
         signum = os.WSTOPSIG(s)