r812 - in zope-common/trunk: . debian

[Bernd Zeimetz]

Author: bzed-guest
Date: 2007-04-17 23:49:07 +0000 (Tue, 17 Apr 2007)
New Revision: 812

Modified:
   zope-common/trunk/debian/changelog
   zope-common/trunk/dzhandle
Log:
dzhandle: adding support for mkzopeinstance --skelsrc


Modified: zope-common/trunk/debian/changelog
===================================================================
--- zope-common/trunk/debian/changelog	2007-04-14 00:28:50 UTC (rev 811)
+++ zope-common/trunk/debian/changelog	2007-04-17 23:49:07 UTC (rev 812)
@@ -1,3 +1,9 @@
+zope-common (0.5.33) UNRELEASED; urgency=low
+
+  * dzhandle: adding support for mkzopeinstance --skelsrc
+
+ -- Bernd Zeimetz <bernd at bzed.de>  Wed, 18 Apr 2007 01:39:31 +0200
+
 zope-common (0.5.32) unstable; urgency=low
 
   [ Matthias Klose ]

Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2007-04-14 00:28:50 UTC (rev 811)
+++ zope-common/trunk/dzhandle	2007-04-17 23:49:07 UTC (rev 812)
@@ -1,4 +1,4 @@
-#! /usr/bin/python2.4
+#!/usr/bin/python2.4
 
 # Copyright (C) 2005-2006 Matthias Klose <doko at ubuntu.com>
 #                         Fabio Tranchitella <kobold at debian.org>
@@ -1425,6 +1425,8 @@
                          action='store', dest='srvuser', default='zope:zope')
             p.add_option('', '--service-port', help="HTTP port used to run this instance",
                          action='store', dest='srvport', default='9673')
+            p.add_option('', '--skelsrc', help="the dir from which skeleton files should be copied",
+                         action='store', dest='skel')
             self._option_parser = p
         return self._option_parser
 
@@ -1472,6 +1474,13 @@
         if not self.options.restart in ('configuring', 'end', 'manually'):
             self.error("unknown restart policy `%s'" % self.options.restart)
 
+        if self.options.skel:
+            self.options.skel = os.path.normpath(os.path.expanduser(self.options.skel))
+            if not os.path.exists(self.options.skel):
+                self.error("skeleton source path `%s' does not exist" % self.options.skel)
+            if not os.access("%s/etc/zope.conf.in" % self.options.skel, os.R_OK):
+                self.error("`%s/etc/zope.conf.in' missing or not readable" % self.options.skel)
+
         self.zope = filter_zope_version(version=self.zversion)
         if is_root():
             self.instance_home = os.path.join(self.zope['instance'], self.instance_name)
@@ -1494,6 +1503,8 @@
             cmd.append('--service-user=' + self.options.srvuser)
         if self.options.srvport:
             cmd.append('--service-port=' + self.options.srvport)
+        if self.options.skel:
+            cmd.append('--skelsrc=' + self.options.skel)
 
         # zope3's mkzopeinstance doesn't create the parents dir
         if self.zope['version'] == '3' and not os.path.isdir(self.instance_home):