# HG changeset patch # User ymh # Date 1406848052 -7200 # Node ID 81a5cb5aa26313d74679a38a38a6bd2a1c6d4c87 # Parent bb39eafd5293ee87047e0c80eb2f107a5beb7822 correct virtualenv build problem for python 2.7 diff -r bb39eafd5293 -r 81a5cb5aa263 virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Fri Jun 22 20:44:32 2012 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Fri Aug 01 01:07:32 2014 +0200 @@ -133,7 +133,8 @@ if os.path.exists(setuptools_path) and os.path.isdir(setuptools_path): patch_dest_path = os.path.join(lib_dir, 'site-packages') else: - patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools-0.6c11-py%s.%s.egg' % (sys.version_info[0], sys.version_info[1])) + #patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools-0.6c11-py%s.%s.egg' % (sys.version_info[0], sys.version_info[1])) + patch_dest_path = os.path.join(lib_dir,'site-packages','setuptools') if os.path.isfile(patch_dest_path): # must unzip egg # rename file and etract all @@ -143,7 +144,7 @@ os.remove(patch_dest_path + ".zip") logger.notify("Patch jcc : %s " % (patch_dest_path)) os.chdir(patch_dest_path) - p = patch.fromfile(os.path.join(jcc_src_path,"jcc","patches","patch.43.0.6c11")) + p = patch.fromfile(os.path.join(jcc_src_path,"jcc","patches","patch.3.6")) p.apply() os.chdir(olddir) diff -r bb39eafd5293 -r 81a5cb5aa263 virtualenv/res/src/pylucene-3.6.0-2-src.tar.gz Binary file virtualenv/res/src/pylucene-3.6.0-2-src.tar.gz has changed diff -r bb39eafd5293 -r 81a5cb5aa263 virtualenv/sync/res/res_create_env.py --- a/virtualenv/sync/res/res_create_env.py Fri Jun 22 20:44:32 2012 +0200 +++ b/virtualenv/sync/res/res_create_env.py Fri Aug 01 01:07:32 2014 +0200 @@ -7,7 +7,7 @@ INSTALLS = [#(key,method, option_str, dict_extra_env) ('DISTRIBUTE', 'pip', None, None), - ('PYCRYPTO', 'pip', None, None), +# ('PYCRYPTO', 'pip', None, None), ('SSH', 'pip', None, None), ('FABRIC', 'pip', None, None), ('MERCURIAL', 'pip', None, None),