r815 - zope-common/trunk

[Bernd Zeimetz]

Author: bzed-guest
Date: 2007-04-18 16:52:33 +0000 (Wed, 18 Apr 2007)
New Revision: 815

Modified:
   zope-common/trunk/dzhandle
   zope-common/trunk/dzhandle.sgml
Log:
check for subdirectories in the skeleton


Modified: zope-common/trunk/dzhandle
===================================================================
--- zope-common/trunk/dzhandle	2007-04-18 09:54:44 UTC (rev 814)
+++ zope-common/trunk/dzhandle	2007-04-18 16:52:33 UTC (rev 815)
@@ -2,6 +2,7 @@
 
 # Copyright (C) 2005-2006 Matthias Klose <doko at ubuntu.com>
 #                         Fabio Tranchitella <kobold at debian.org>
+# Copyright (C)      2007 Bernd Zeimetz <bernd at bzed.de> 
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1478,6 +1479,11 @@
             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)
+            needed_dirs = ('bin', 'etc', 'Extensions', 'import', 'lib', 'log',
+                           'Products', 'var')
+            for n_dir in needed_dirs:
+                if not os.path.exists("%s/%s" % (self.options.skel, n_dir)):
+                    self.error("subdirectory `%s' missing in skeleton source `%s'" % (n_dir, 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')

Modified: zope-common/trunk/dzhandle.sgml
===================================================================
--- zope-common/trunk/dzhandle.sgml	2007-04-18 09:54:44 UTC (rev 814)
+++ zope-common/trunk/dzhandle.sgml	2007-04-18 16:52:33 UTC (rev 815)
@@ -141,7 +141,8 @@
             <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',
+              the following directories: `bin', `etc', `Extensions', `import', `lib', `log', `Products', `var'
+              and 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>