r571 - in zope-common/trunk: . debian

[Fabio Tranchitella]

Author: kobold
Date: 2007-01-12 10:37:42 +0100 (Fri, 12 Jan 2007)
New Revision: 571

Modified:
   zope-common/trunk/debian/changelog
   zope-common/trunk/dzhandle
Log:
Preparing the new debian release.


Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2007-01-08 08:39:09 UTC (rev 570)
+++ zope-common/trunk/debian/changelog	2007-01-12 09:37:42 UTC (rev 571)
@@ -1,3 +1,10 @@
+zope-common (0.5.30) unstable; urgency=low
+
+  * dzhandle: do not break on purged instances while checking if they are
+    running.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Fri, 12 Jan 2007 10:28:42 +0100
+
 zope-common (0.5.29) unstable; urgency=high
 
   * dzhandle: fixed a bug which causes broken upgrade for global zope3

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2007-01-08 08:39:09 UTC (rev 570)
+++ zope-common/trunk/dzhandle	2007-01-12 09:37:42 UTC (rev 571)
@@ -1962,7 +1962,8 @@
 
     def is_running(self):
         cmd = [os.path.join(self.home, 'bin', 'zopectl'), 'status']
-        return "program running;" in subprocess.Popen(args=cmd,
+        return os.path.isfile(cmd[0]) and \
+            "program running;" in subprocess.Popen(args=cmd,
             stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout.read()
 
     def zopectl(self, *args):