r1782 - in zope-common/trunk (debian/changelog dzhandle)

[doko at users.alioth.debian.org]

    Date: Sunday, September 20, 2009 @ 13:02:36
  Author: doko
Revision: 1782

  [ Matthias Klose ]
  * Fix version detection for zope2.12 startup scripts.

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

Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2009-09-20 12:58:08 UTC (rev 1781)
+++ zope-common/trunk/debian/changelog	2009-09-20 13:02:36 UTC (rev 1782)
@@ -1,8 +1,13 @@
 zope-common (0.5.50) unstable; urgency=low
 
   * NOT RELEASED YET
+
+  [ Jonas Meurer ]
   * change section to zope.
 
+  [ Matthias Klose ]
+  * Fix version detection for zope2.12 startup scripÃt.
+
  -- Jonas Meurer <mejo at debian.org>  Tue, 11 Aug 2009 12:00:33 +0200
 
 zope-common (0.5.49) unstable; urgency=high

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2009-09-20 12:58:08 UTC (rev 1781)
+++ zope-common/trunk/dzhandle	2009-09-20 13:02:36 UTC (rev 1782)
@@ -1545,7 +1545,7 @@
         if os.path.exists(zopectl + '.disabled'):
             os.rename(zopectl + '.disabled', zopectl)
             return
-        if self.zversion.startswith('2.'):
+        if self.zversion in ('2.6', '2.7', '2.8', '2.9', '2.10', '2.11'):
             cmd = [os.path.join(self.zope['prefix'], 'bin', 'mkzopeinstance.py')]
         else:
             cmd = [os.path.join(self.zope['prefix'], 'bin', 'mkzopeinstance'), '--password-manager=MD5']
@@ -1563,7 +1563,7 @@
             cmd.append('--zeo-server=' + self.options.zeoserver)
 
         # zope3's mkzopeinstance doesn't create the parents dir
-        if self.zope['version'] == '3' and not os.path.isdir(self.instance_home):
+        if self.zope['version'] in ('2.11', '3') and not os.path.isdir(self.instance_home):
             os.makedirs(self.instance_home)
             os.rmdir(self.instance_home)
 
@@ -1649,7 +1649,7 @@
             os.rename(zeoctl + '.disabled', zeoctl)
             return
 
-        if self.zversion.startswith('2.'):
+        if self.zversion in ('2.6', '2.7', '2.8', '2.9', '2.10', '2.11'):
             cmd = [os.path.join(self.zope['prefix'], 'bin', 'mkzeoinstance.py')]
         else:
             cmd = [os.path.join(self.zope['prefix'], 'bin', 'mkzeoinstance')]