r886 - in /zope-common/trunk: debian/changelog dzhandle

[kobold at users.alioth.debian.org]

Author: kobold
Date: Fri Jun 15 14:27:46 2007
New Revision: 886

URL: http://svn.debian.org/wsvn/pkg-zope/?sc=1&rev=886
Log:
Added support for --zeo-server to the make-instance command; fixed a bug for
non-root usage: don'0 change the permissions for the bin directory.

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

Modified: zope-common/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zope/zope-common/trunk/debian/changelog?rev=886&op=diff
==============================================================================
--- zope-common/trunk/debian/changelog (original)
+++ zope-common/trunk/debian/changelog Fri Jun 15 14:27:46 2007
@@ -1,3 +1,12 @@
+zope-common (0.5.34) unstable; urgency=low
+
+  * dzhandle:
+    + added support for --zeo-server to the make-instance command.
+    + fixed a bug for non-root usage: don'0 change the permissions for the bin
+      directory.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Fri, 15 Jun 2007 16:10:17 +0200
+
 zope-common (0.5.33) unstable; urgency=high
 
   * dzhandle:

Modified: zope-common/trunk/dzhandle
URL: http://svn.debian.org/wsvn/pkg-zope/zope-common/trunk/dzhandle?rev=886&op=diff
==============================================================================
--- zope-common/trunk/dzhandle (original)
+++ zope-common/trunk/dzhandle Fri Jun 15 14:27:46 2007
@@ -1430,6 +1430,8 @@
                          action='store', dest='srvport', default='9673')
             p.add_option('', '--skelsrc', help="the directory from which skeleton files should be copied",
                          action='store', dest='skel')
+            p.add_option('', '--zeo-server', help="use ZEO instead of a local ZODB database (host:port)",
+                         action='store', dest='zeoserver', default=None)
             self._option_parser = p
         return self._option_parser
 
@@ -1518,6 +1520,8 @@
             cmd.append('--service-port=' + self.options.srvport)
         if self.options.skel:
             cmd.append('--skelsrc=' + self.options.skel)
+        if self.options.zeoserver:
+            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):
@@ -1529,11 +1533,12 @@
             subprocess.call(['/bin/rm', '-fr', self.instance_home])
             sys.exit(rv)
         
-        #giving the bin dir to root:root (#388072)
-        for chown_file in os.listdir(os.path.join(self.instance_home, 'bin')):
-            os.chown(os.path.join(self.instance_home, 'bin', chown_file), 0, 0)
-        os.chown(os.path.join(self.instance_home, 'bin'), 0, 0)
-        
+        # giving the bin dir to root:root (#388072)
+        if is_root():
+            for chown_file in os.listdir(os.path.join(self.instance_home, 'bin')):
+                os.chown(os.path.join(self.instance_home, 'bin', chown_file), 0, 0)
+            os.chown(os.path.join(self.instance_home, 'bin'), 0, 0)
+            
         instance = ZopeInstance(self.instance_home, self.zversion, read_dzfile=False)
         instance.set_addon_mode(self.options.amode)
         instance.set_addon_technique(self.options.atechnique)