r813 - zope-common/trunk

[Bernd Zeimetz]

Author: bzed-guest
Date: 2007-04-18 00:19:48 +0000 (Wed, 18 Apr 2007)
New Revision: 813

Modified:
   zope-common/trunk/dzhandle
   zope-common/trunk/dzhandle.sgml
Log:
better checks for --skelsrc, updating the manpage


Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2007-04-17 23:49:07 UTC (rev 812)
+++ zope-common/trunk/dzhandle	2007-04-18 00:19:48 UTC (rev 813)
@@ -1425,7 +1425,7 @@
                          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",
+            p.add_option('', '--skelsrc', help="the directory from which skeleton files should be copied",
                          action='store', dest='skel')
             self._option_parser = p
         return self._option_parser
@@ -1478,8 +1478,13 @@
             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)
+            needed_files = ('bin/zopeservice.py.in', 'bin/runzope.bat.in',
+                            'bin/runzope.in', 'bin/runzope.in', 'bin/zopectl.in',
+                            'etc/zope.conf.in')
+            for n_file in needed_files:
+                n_file = "%s/%s" %(self.options.skel, n_file) 
+                if not os.access(n_file, os.R_OK):
+                    self.error("`%s' missing or not readable" % n_file)
 
         self.zope = filter_zope_version(version=self.zversion)
         if is_root():

Modified: zope-common/trunk/dzhandle.sgml
===================================================================
--- zope-common/trunk/dzhandle.sgml	2007-04-17 23:49:07 UTC (rev 812)
+++ zope-common/trunk/dzhandle.sgml	2007-04-18 00:19:48 UTC (rev 813)
@@ -4,7 +4,7 @@
   <!ENTITY dhfirstname "<firstname>Fabio</firstname>">
   <!ENTITY dhsurname   "<surname>Tranchitella</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
-  <!ENTITY dhdate      "<date>Aug 19, 2005</date>">
+  <!ENTITY dhdate      "<date>Apr 18, 2007</date>">
   <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
        allowed: see man(7), man(1). -->
   <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
@@ -138,6 +138,12 @@
               <listitem><para>HTTP port used to run this instance (default 9673); this setting can be modified
               later editing the zope.conf file of the instance.</para></listitem>
             </varlistentry>
+            <varlistentry>
+              <term>--skelsrc=SKEL</term>
+              <listitem><para>the directory from which skeleton files should be copied; must at least contain
+              the following files: `bin/zopeservice.py.in', `bin/runzope.bat.in', `bin/runzope.in',
+              `bin/runzope.in', `bin/zopectl.in', `etc/zope.conf.in'.</para></listitem>
+            </varlistentry>
           </variablelist>
         </listitem>
       </varlistentry>