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

[pumazi-guest at users.alioth.debian.org]

    Date: Friday, November 12, 2010 @ 18:31:13
  Author: pumazi-guest
Revision: 2137

Updating zope2.12 info and correcting the mkzopeinstance subcall options for zope2.12. I've removed the --password-manager option from the mkzopeinstance command. I'm not sure where this option came from; so feel free to blame me for commenting it out if it becomes an issue.

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

Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2010-11-12 18:24:07 UTC (rev 2136)
+++ zope-common/trunk/debian/changelog	2010-11-12 18:31:13 UTC (rev 2137)
@@ -1,8 +1,10 @@
 zope-common (0.5.51) unstable; urgency=low
 
   * Adding myself to the Uploader list.
+  * Updating zope2.12 info and correcting the mkzopeinstance subcall
+    options.
 
- -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Tue, 09 Nov 2010 03:56:36 -0500
+ -- Michael Mulich (pumazi) <michael.mulich at gmail.com>  Tue, 09 Nov 2010 04:02:55 -0500
 
 zope-common (0.5.50) unstable; urgency=low
 

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2010-11-12 18:24:07 UTC (rev 2136)
+++ zope-common/trunk/dzhandle	2010-11-12 18:31:13 UTC (rev 2137)
@@ -84,7 +84,7 @@
       'prefix': '/usr/lib/zope2.12',
       'instance': '/var/lib/zope2.12/instance',
       'zeoinstance': '/var/lib/zope2.12/zeo',
-      'pyver': '2.5'
+      'pyver': '2.6'
       },
     { 'name': 'zope3',
       'version': '3',
@@ -1548,7 +1548,7 @@
         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']
+            cmd = [os.path.join(self.zope['prefix'], 'bin', 'mkzopeinstance')] ##, '--password-manager=MD5']
         cmd.append('--dir=%s' % self.instance_home)
         cmd.append('--layout=%s' % (is_root() and 'fhs' or 'zope'))
         if self.options.user:
@@ -1562,8 +1562,11 @@
         if self.options.zeoserver:
             cmd.append('--zeo-server=' + self.options.zeoserver)
 
+        if self.zope['version'] in ('2.12'):
+            cmd.append('--python=' + os.path.join(self.zope['prefix'], 'bin', 'python'))
+
         # zope3's mkzopeinstance doesn't create the parents dir
-        if self.zope['version'] in ('2.11', '3') and not os.path.isdir(self.instance_home):
+        if self.zope['version'] in ('2.11', '2.12', '3') and not os.path.isdir(self.instance_home):
             os.makedirs(self.instance_home)
             os.rmdir(self.instance_home)