[Checkins] SVN: z3c.recipe.eggbasket/trunk/ When installing the requirements from the tarball, we now look in the

[Maurits van Rees]

Log message for revision 90775:
  When installing the requirements from the tarball, we now look in the
  default index (python cheese shop usually) when the requirements can
  not be met by only the tarball.  This should not happen, but it does.
  

Changed:
  U   z3c.recipe.eggbasket/trunk/CHANGES.txt
  U   z3c.recipe.eggbasket/trunk/z3c/recipe/eggbasket/utils.py

-=-
Modified: z3c.recipe.eggbasket/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.eggbasket/trunk/CHANGES.txt	2008-09-03 22:40:36 UTC (rev 90774)
+++ z3c.recipe.eggbasket/trunk/CHANGES.txt	2008-09-03 23:30:36 UTC (rev 90775)
@@ -1,7 +1,10 @@
 0.4.0 (unreleased)
 ==================
 
-* ...
+* When installing the requirements from the tarball, we now look in
+  the default index (python cheese shop usually) when the requirements
+  can not be met by only the tarball.  This should not happen, but it
+  does.  [maurits]
 
 0.3.1 (2008-07-13)
 ==================

Modified: z3c.recipe.eggbasket/trunk/z3c/recipe/eggbasket/utils.py
===================================================================
--- z3c.recipe.eggbasket/trunk/z3c/recipe/eggbasket/utils.py	2008-09-03 22:40:36 UTC (rev 90774)
+++ z3c.recipe.eggbasket/trunk/z3c/recipe/eggbasket/utils.py	2008-09-03 23:30:36 UTC (rev 90775)
@@ -8,15 +8,30 @@
 import urllib
 
 
-def install_distributions(distributions, target_dir, links=[]):
+def install_distributions(distributions, target_dir, links=[],
+                          use_empty_index=False):
+    """Install distributions.
+
+    Distributions is a list of requirements, e.g. ['grok==0.13']
+
+    When use_empty_index is True we only try to install the required
+    distributions by using the supplied links.  We do not use the
+    python cheese shop index then.
+
+    """
     from zc.buildout.easy_install import install
     from zc.buildout.easy_install import MissingDistribution
     try:
         empty_index = tempfile.mkdtemp()
+        if use_empty_index:
+            index = 'file://' + empty_index
+        else:
+            # Use the default index (python cheese shop)
+            index = None
 
         try:
             install(distributions, target_dir, newest=False,
-                    links=links, index='file://' + empty_index)
+                    links=links, index=index)
         except MissingDistribution:
             return False
         else:
@@ -31,7 +46,7 @@
     # letting easy_install only look inside that same target dir while
     # doing that.
     result = install_distributions(distributions, target_dir,
-                                   links=[target_dir])
+                                   links=[target_dir], use_empty_index=True)
     return result