# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1339705933 -7200
# Node ID fe9cfbb919094544b42f7737b9f8c53007ea9fdf
# Parent  1bbf2fe38a3213f56fef1b06ea6b0d17e42b0e78
reinstall distribute

diff -r 1bbf2fe38a32 -r fe9cfbb91909 sbin/sync/fabfile.py
--- a/sbin/sync/fabfile.py	Thu Jun 14 21:42:20 2012 +0200
+++ b/sbin/sync/fabfile.py	Thu Jun 14 22:32:13 2012 +0200
@@ -153,10 +153,12 @@
         prefix_str = "source \"%s\"" % os.path.join(env.remote_baseline_venv, "bin/activate")
     else:
         prefix_str = "echo"
+    with settings(warn_only=True):
+        run("rm -fr \"%s\"" % remotevirtualenvpath)
     run("mkdir -p \"%s\"" % remotevirtualenvpath)
     with prefix(prefix_str), cd(os.path.join(remote_venv_export_path,"virtualenv","web")):
         run("python create_python_env.py")
-        run("python project-boot.py --unzip-setuptools --no-site-packages --clear --type-install=local \"%s\"" % remotevirtualenvpath)
+        run("python project-boot.py \"%s\"" % remotevirtualenvpath)
     with prefix("source \"%s\"" % activate_path):
         run("pip install -r \"%s\"" % os.path.join(remote_venv_export_path,"virtualenv","web","res","srvr_requirements.txt"))
 
diff -r 1bbf2fe38a32 -r fe9cfbb91909 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Thu Jun 14 21:42:20 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Thu Jun 14 22:32:13 2012 +0200
@@ -13,6 +13,7 @@
 
 URLS = {
     #'': {'setup': '', 'url':'', 'local':''},
+    'DISTRIBUTE': {'setup': 'distribute', 'url':'http://pypi.python.org/packages/source/d/distribute/distribute-0.6.24.tar.gz', 'local':"distribute-0.6.24.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO': {'setup': 'django', 'url': 'http://www.djangoproject.com/download/1.4/tarball/', 'local':"Django-1.4.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-EXTENSIONS': { 'setup': 'django-extensions', 'url':'https://github.com/django-extensions/django-extensions/tarball/0.8', 'local':"django-extensions-0.8.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-REGISTRATION': { 'setup': 'django-registration', 'url':'https://bitbucket.org/ubernostrum/django-registration/get/v0.8.tar.gz', 'local':"django-registration-0.8.tar.gz", 'install': {'method': 'easy_install', 'option_str': '-Z', 'dict_extra_env': None}},
diff -r 1bbf2fe38a32 -r fe9cfbb91909 virtualenv/res/src/distribute-0.6.14.tar.gz
Binary file virtualenv/res/src/distribute-0.6.14.tar.gz has changed
diff -r 1bbf2fe38a32 -r fe9cfbb91909 virtualenv/res/src/distribute-0.6.24.tar.gz
Binary file virtualenv/res/src/distribute-0.6.24.tar.gz has changed
diff -r 1bbf2fe38a32 -r fe9cfbb91909 virtualenv/web/res/res_create_env.py
--- a/virtualenv/web/res/res_create_env.py	Thu Jun 14 21:42:20 2012 +0200
+++ b/virtualenv/web/res/res_create_env.py	Thu Jun 14 22:32:13 2012 +0200
@@ -7,6 +7,7 @@
 
 INSTALLS = [ #(key,method, option_str, dict_extra_env)
     'PYLUCENE',
+    'LXML',
     'PSYCOPG2',
     'SOUTH',
     'PIL', 
@@ -23,12 +24,14 @@
     'SOCIAL_AUTH',
     'DJANGO_GUARDIAN',
     'SORL_THUMBNAIL',
-    'LXML',
 ]
 
 if system_str == 'Windows':
     INSTALLS.insert(0, 'JCC')
 
+if system_str == "Linux":
+    INSTALLS.insert(2, 'DISTRIBUTE')
+
 OPTIONS_TO_ADD = ['clear', 'type_install=local', 'unzip_setuptools']
 if system_str != 'Linux':
     OPTIONS_TO_ADD.append('use_distribute')