[Checkins] SVN: zc.buildout/branches/gary-6/ merge from gary-5

[Gary Poster]

Log message for revision 109426:
  merge from gary-5

Changed:
  _U  zc.buildout/branches/gary-6/
  U   zc.buildout/branches/gary-6/src/zc/buildout/easy_install.py

-=-

Property changes on: zc.buildout/branches/gary-6
___________________________________________________________________
Modified: svn:mergeinfo
   - /zc.buildout/branches/gary-5:109333-109334,109383,109387
/zc.buildout/branches/gary-2:108913,109099
/zc.buildout/branches/gary-3:108914,109100
/zc.buildout/branches/gary-1:109098

   + /zc.buildout/branches/gary-5:109333-109334,109383,109387,109425
/zc.buildout/branches/gary-2:108913,109099
/zc.buildout/branches/gary-3:108914,109100
/zc.buildout/branches/gary-1:109098

Modified: svk:merge
   - 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-3:109100
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109334
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109383
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109387

   + 62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-3:109100
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109334
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109383
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109387
62d5b8a3-27da-0310-9561-8e5933582275:/zc.buildout/branches/gary-5:109425


Modified: zc.buildout/branches/gary-6/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/branches/gary-6/src/zc/buildout/easy_install.py	2010-02-24 23:22:47 UTC (rev 109425)
+++ zc.buildout/branches/gary-6/src/zc/buildout/easy_install.py	2010-02-24 23:25:03 UTC (rev 109426)
@@ -294,9 +294,9 @@
                  newest=True,
                  versions=None,
                  use_dependency_links=None,
+                 allow_hosts=('*',),
                  include_site_packages=None,
-                 allowed_eggs_from_site_packages=None,
-                 allow_hosts=('*',)
+                 allowed_eggs_from_site_packages=None
                  ):
         self._dest = dest
         self._allow_hosts = allow_hosts
@@ -1014,28 +1014,27 @@
             links=(), index=None,
             executable=sys.executable, always_unzip=None,
             path=None, working_set=None, newest=True, versions=None,
-            use_dependency_links=None, include_site_packages=None,
-            allowed_eggs_from_site_packages=None, allow_hosts=('*',)):
+            use_dependency_links=None, allow_hosts=('*',),
+            include_site_packages=None, allowed_eggs_from_site_packages=None):
     installer = Installer(dest, links, index, executable, always_unzip, path,
                           newest, versions, use_dependency_links,
+                          allow_hosts=allow_hosts,
                           include_site_packages=include_site_packages,
                           allowed_eggs_from_site_packages=
-                            allowed_eggs_from_site_packages,
-                          allow_hosts=allow_hosts)
+                            allowed_eggs_from_site_packages)
     return installer.install(specs, working_set)
 
 
 def build(spec, dest, build_ext,
           links=(), index=None,
           executable=sys.executable,
-          path=None, newest=True, versions=None, include_site_packages=None,
-          allowed_eggs_from_site_packages=None, allow_hosts=('*',)):
+          path=None, newest=True, versions=None, allow_hosts=('*',),
+          include_site_packages=None, allowed_eggs_from_site_packages=None):
     installer = Installer(dest, links, index, executable, True, path, newest,
-                          versions,
+                          versions, allow_hosts=allow_hosts,
                           include_site_packages=include_site_packages,
                           allowed_eggs_from_site_packages=
-                            allowed_eggs_from_site_packages,
-                          allow_hosts=allow_hosts)
+                            allowed_eggs_from_site_packages)
     return installer.build(spec, build_ext)