[Checkins] SVN: z3c.recipe.ldap/trunk/z3c/recipe/ldap/slapd.py Avoid clobbering the index option. Not sure how to test for this yet.

Ross Patterson me at rpatterson.net
Wed Dec 12 02:55:40 EST 2007


Log message for revision 82263:
  Avoid clobbering the index option.  Not sure how to test for this yet.
  

Changed:
  U   z3c.recipe.ldap/trunk/z3c/recipe/ldap/slapd.py

-=-
Modified: z3c.recipe.ldap/trunk/z3c/recipe/ldap/slapd.py
===================================================================
--- z3c.recipe.ldap/trunk/z3c/recipe/ldap/slapd.py	2007-12-12 02:05:17 UTC (rev 82262)
+++ z3c.recipe.ldap/trunk/z3c/recipe/ldap/slapd.py	2007-12-12 07:55:39 UTC (rev 82263)
@@ -12,9 +12,18 @@
     """This recipe is used by zc.buildout"""
 
     def __init__(self, buildout, name, options):
-        self.egg = zc.recipe.egg.Egg(buildout, options['recipe'], options)
         self.name, self.options = name, options
 
+        # Avoid clobbering the index option
+        # TODO Figure out how to test for this
+        index = options.pop('index', None)
+        self.egg = zc.recipe.egg.Egg(buildout, options['recipe'],
+                                     options)
+        if index is None:
+            options.pop('index', None)
+        else:
+            options['index'] = index
+
         options['location'] = os.path.join(
             buildout['buildout']['parts-directory'], name)
 



More information about the Checkins mailing list