From 5dda8efa02d22a474adfbd748d673703be662f94 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 30 Sep 2013 01:31:09 -0400
Subject: [PATCH] Add distribute to the pre-install list

mysql-python is crapping the fantastic bong because of a continued
reliance on distribute. Fine. We'll just make sure we have latest
no-op package in our virtualenv so that epic fail stops killing bunnies.

Also, when we're running the wheel command in our venvs, we kinda need
wheel to be installed in them.

Change-Id: I004ca4efdbe5997b4f5f56e71a330ed7354d5cd2
---
 pypi_mirror/cmd/run_mirror.py | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pypi_mirror/cmd/run_mirror.py b/pypi_mirror/cmd/run_mirror.py
index a25d3d1..4a1c92c 100644
--- a/pypi_mirror/cmd/run_mirror.py
+++ b/pypi_mirror/cmd/run_mirror.py
@@ -245,13 +245,15 @@ class Mirror(object):
                     # the setuptools upgrade issues, so upgrading that first
                     # is a good idea
                     for requirement in [
-                            "pip", "setuptools", "wheel", "virtualenv"]:
+                            "pip", "setuptools", "distribute",
+                            "wheel", "virtualenv"]:
                         self.run_command(
                             upgrade_format % dict(
                                 pip=pip, download_cache=pip_cache_dir,
                                 build_dir=build, find_links=wheelhouse,
                                 requirement=requirement))
-                    for requirement in ["pip", "setuptools", "virtualenv"]:
+                    for requirement in [
+                            "pip", "setuptools", "distribute", "virtualenv"]:
                         self.run_command(
                             wheel_format % dict(
                                 pip=pip, download_cache=pip_cache_dir,
@@ -293,6 +295,23 @@ class Mirror(object):
                         reqfd.close()
                         self.run_command(venv_format % dict(
                             extra_search_dir=pip_cache_dir, venv_dir=venv))
+                        for requirement in [
+                                "pip", "setuptools", "distribute",
+                                "wheel", "virtualenv"]:
+                            self.run_command(
+                                upgrade_format % dict(
+                                    pip=pip, download_cache=pip_cache_dir,
+                                    build_dir=build, find_links=wheelhouse,
+                                    requirement=requirement))
+                        for requirement in [
+                                "pip", "setuptools", "distribute",
+                                "virtualenv"]:
+                            self.run_command(
+                                wheel_format % dict(
+                                    pip=pip, download_cache=pip_cache_dir,
+                                    find_links=wheelhouse,
+                                    wheel_dir=wheelhouse,
+                                    requirement=requirement))
                         if os.path.exists(build):
                             shutil.rmtree(build)
                         self.run_command(