r1683 - in zope-common/trunk (debian/changelog debian/control dzhandle)

[Jonas Meurer]

    Date: Sunday, August 9, 2009 @ 13:55:15
  Author: mejo
Revision: 1683

use invoke-rc.d to restart pending instances, add breaks

Modified:
  zope-common/trunk/debian/changelog
  zope-common/trunk/debian/control
  zope-common/trunk/dzhandle

Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2009-08-08 11:52:55 UTC (rev 1682)
+++ zope-common/trunk/debian/changelog	2009-08-09 13:55:15 UTC (rev 1683)
@@ -1,14 +1,17 @@
 zope-common (0.5.49) unstable; urgency=low
 
-  * NOT RELEASED YET
   * add zope2.12 to known zope releases in dzhandle.
   * bump standards-version to 3.8.2, noch changes needed.
   * bump debhelper compat level to 6.
   * add russian debconf translation, thanks to Yuri Kozlov. (closes: #539466)
   * add spanish debconf translation, thanks to Fernando González de Requena.
     (closes: #539588)
+  * use 'invoke-rc.d zopeZVER restart INSTANCE=<name>' to restart pending zope
+    instances in DZRestartPendingInstances.run().
+  * add Breaks: zope2.7, zope2.8, zope2.9, zope2.10 (<< 2.10.9), zope2.11
+    (<< 2.11.4) for that reason.
 
- -- Jonas Meurer <mejo at debian.org>  Sun, 02 Aug 2009 14:04:29 +0200
+ -- Jonas Meurer <mejo at debian.org>  Sun, 09 Aug 2009 15:49:53 +0200
 
 zope-common (0.5.48) unstable; urgency=low
 

Modified: zope-common/trunk/debian/control
===================================================================
--- zope-common/trunk/debian/control	2009-08-08 11:52:55 UTC (rev 1682)
+++ zope-common/trunk/debian/control	2009-08-09 13:55:15 UTC (rev 1683)
@@ -11,6 +11,7 @@
 
 Package: zope-common
 Architecture: all
+Breaks: zope2.7, zope2.8, zope2.9, zope2.10 (<< 2.10.9), zope2.11 (<< 2.11.4)
 Depends: adduser, python2.4, ${misc:Depends}
 Description: common settings and scripts for Zope installations
  This package contains common settings and scripts for Zope installations.

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2009-08-08 11:52:55 UTC (rev 1682)
+++ zope-common/trunk/dzhandle	2009-08-09 13:55:15 UTC (rev 1683)
@@ -1300,7 +1300,8 @@
                 home = os.path.dirname(os.path.dirname(pending))
                 instance = ZopeInstance(home, zope['version'])
                 if instance.is_running():
-                    instance.zopectl('restart')
+                    #instance.zopectl('restart')
+                    subprocess.call(['/usr/sbin/invoke-rc.d', 'zope%s' % zope['version'], 'restart', 'INSTANCE=%s' % zope['instance']])
                 os.unlink(pending)
 
         # compatibility with old 2.6 installations