[Erp5-report] r30046 - /experimental/erp5.buildout/recipes/create_erp5_site.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Tue Oct 27 18:02:12 2009
New Revision: 30046

URL: http://svn.erp5.org?rev=30046&view=rev
Log:
Only guess the location of the control-script if one wasn't given

Modified:
    experimental/erp5.buildout/recipes/create_erp5_site.py

Modified: experimental/erp5.buildout/recipes/create_erp5_site.py
URL: http://svn.erp5.org/experimental/erp5.buildout/recipes/create_erp5_site.py?rev=30046&r1=30045&r2=30046&view=diff
==============================================================================
--- experimental/erp5.buildout/recipes/create_erp5_site.py [utf8] (original)
+++ experimental/erp5.buildout/recipes/create_erp5_site.py [utf8] Tue Oct 27 18:02:12 2009
@@ -7,14 +7,15 @@
 
     def __init__(self, buildout, name, options):
         self.buildout, self.name, self.options = buildout, name, options
-        # Guess the name of the install script by looking at the section using
-        # zope2instance recipe
-        for k, v in self.buildout.items():
-            if v.get('recipe') == 'plone.recipe.zope2instance':
-                instance_script = v.get('control-script')
-                options['control-script'] = instance_script or k
-                options['instance-location'] = v['location']
-        assert 'control-script' in options, 'Unable to find a zope2 instance'
+        if not options.get('control-script'):
+            # Guess the name of the zope control script by looking at the section using
+            # zope2instance recipe
+            for k, v in self.buildout.items():
+                if v.get('recipe') == 'plone.recipe.zope2instance':
+                    instance_script = v.get('control-script')
+                    options['control-script'] = instance_script or k
+                    options['instance-location'] = v['location']
+            assert 'control-script' in options, 'Unable to find a zope2 instance'
 
         options['bin-directory'] = buildout['buildout']['bin-directory']