[Checkins] SVN: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py Refactored to not pass an always_unzip option to

Jim Fulton jim at zope.com
Fri Jul 18 16:51:20 EDT 2008


Log message for revision 88548:
  Refactored to not pass an always_unzip option to
  zc.buildout.easy_install.install if the user didn't use an unzip
  option. This is to allow defaults set at the buildout level to be honored.
  

Changed:
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py

-=-
Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py	2008-07-18 20:51:00 UTC (rev 88547)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py	2008-07-18 20:51:12 UTC (rev 88548)
@@ -75,16 +75,23 @@
                 [options['develop-eggs-directory'], options['eggs-directory']]
                 )
         else:
+            kw = {}
+            always_unzip = options.get('unzip')
+            if always_unzip is not None:
+                if always_unzip not in ('true', 'false'):
+                    raise zc.buildout.UserError("Invalid value for unzip, %s"
+                                                % always_unzip)
+                kw['always_unzip'] = always_unzip == 'true'
+
             ws = zc.buildout.easy_install.install(
                 distributions, options['eggs-directory'],
                 links = self.links,
                 index = self.index, 
                 executable = options['executable'],
-                always_unzip=options.get('unzip') == 'true',
                 path=[options['develop-eggs-directory']],
                 newest=self.buildout['buildout'].get('newest') == 'true',
-                allow_hosts=self.allow_hosts
-                )
+                allow_hosts=self.allow_hosts,
+                **kw)
 
         return orig_distributions, ws
 



More information about the Checkins mailing list