[Checkins] SVN: gocept.zope3instance/trunk/src/gocept/zope3instance/__init__.py allowing to define the database-config directly

[Christian Zagrodnick]

Log message for revision 76973:
  allowing to define the database-config directly

Changed:
  U   gocept.zope3instance/trunk/src/gocept/zope3instance/__init__.py

-=-
Modified: gocept.zope3instance/trunk/src/gocept/zope3instance/__init__.py
===================================================================
--- gocept.zope3instance/trunk/src/gocept/zope3instance/__init__.py	2007-06-23 09:26:14 UTC (rev 76972)
+++ gocept.zope3instance/trunk/src/gocept/zope3instance/__init__.py	2007-06-23 09:34:57 UTC (rev 76973)
@@ -42,12 +42,12 @@
             os.path.join(buildout['buildout']['directory'], 'skels', name)
             for name in skeletons)
 
+        if 'database-config' not in options:
+            options['database-config'] = '\n'.join([
+                buildout[section]['zconfig']
+                for section in options['database'].split()
+                ])
 
-        options['database-config'] = '\n'.join([
-            buildout[section]['zconfig']
-            for section in options['database'].split()
-            ])
-
         options['bin-directory'] = buildout['buildout']['bin-directory']
 
         # Let the egg recipe do much of the heavy lifting.
@@ -153,7 +153,7 @@
             # Heuristic to avoid SCM files
             if name.startswith('.'):
                 continue
-            if name in ['CVS']:
+            if name == 'CVS':
                 continue
             src_name = os.path.join(src, name)
             if os.path.isdir(src_name):