[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/regress.py

[dean gaudet]

CVSROOT:        /cvsroot/rdiff-backup
Module name:    rdiff-backup
Changes by:     dean gaudet <dgaudet>   07/03/06 18:58:37

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : regress.py 

Log message:
        Use signal 0 rather than signal.NSIG when testing if another 
rdiff-backup
        is still running.  (Patch from Sébastien Maret)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.206&r2=1.207
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/regress.py?cvsroot=rdiff-backup&r1=1.19&r2=1.20

Patches:
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -b -r1.206 -r1.207
--- CHANGELOG   27 Feb 2007 04:50:27 -0000      1.206
+++ CHANGELOG   6 Mar 2007 18:58:37 -0000       1.207
@@ -1,6 +1,9 @@
 New in v1.1.10 (????/??/??)
 ---------------------------
 
+Use signal 0 rather than signal.NSIG when testing if another rdiff-backup
+is still running.  (Patch from Sébastien Maret)
+
 Sockets don't have extended attributes -- don't try to access them.
 (Patch from Andrew Ferguson.)
 

Index: rdiff_backup/regress.py
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/regress.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- rdiff_backup/regress.py     15 Dec 2005 06:12:54 -0000      1.19
+++ rdiff_backup/regress.py     6 Mar 2007 18:58:37 -0000       1.20
@@ -342,11 +342,11 @@
 
        def pid_running(pid):
                """True if we know if process with pid is currently running"""
-               try: os.kill(pid, signal.NSIG)
+               try: os.kill(pid, 0)
                except OSError, exc:
                        if exc[0] == errno.ESRCH: return 0
-                       elif exc[0] == errno.EINVAL: return 1
-               Log("Warning: unable to check if PID %d still running" % 
(pid,), 2)
+                       else: Log("Warning: unable to check if PID %d still 
running" % (pid,), 2)
+               return 1
 
        for curmir_rp in curmir_incs:
                assert Globals.local_connection is curmir_rp.conn