virtualenv/web/res/res_create_env.py
changeset 671 fc56b4c9e4f3
parent 668 b52724db32ab
child 675 38ed996a23d8
--- a/virtualenv/web/res/res_create_env.py	Thu Jun 14 15:03:46 2012 +0200
+++ b/virtualenv/web/res/res_create_env.py	Thu Jun 14 18:26:25 2012 +0200
@@ -1,6 +1,6 @@
 import platform
 
-from lib_create_env import lib_generate_install_methods, lib_add_options
+from lib_create_env import lib_generate_install_methods
 
 system_str = platform.system()
 
@@ -29,11 +29,7 @@
 if system_str == 'Windows':
     INSTALLS.insert(0, 'JCC')
 
-OPTIONS_TO_ADD = ['--no-site-packages','--clear', '--type-install=local']
-if system_str == "Linux":
-    OPTIONS_TO_ADD.append("--unzip-setuptools")
+OPTIONS_TO_ADD = ['clear', 'type_install=local', 'unzip_setuptools', 'use_distribute']
 
 def generate_install_methods(path_locations, src_base, Logger, call_subprocess):    
-    return lib_generate_install_methods(path_locations, src_base, Logger, call_subprocess, INSTALLS)
-
-add_options = lambda : lib_add_options(OPTIONS_TO_ADD)
+    return lib_generate_install_methods(path_locations, src_base, Logger, call_subprocess, INSTALLS, OPTIONS_TO_ADD)