# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1337956812 -7200
# Node ID b419e891b0bde6e88c0337838aca82ec7c5e62b0
# Parent  7d56406068138382d20252b6647a9ef40c8bf27b
correct virtualenv install + sync files

diff -r 7d5640606813 -r b419e891b0bd sbin/sync/fabfile.py
--- a/sbin/sync/fabfile.py	Fri May 25 16:33:16 2012 +0200
+++ b/sbin/sync/fabfile.py	Fri May 25 16:40:12 2012 +0200
@@ -118,7 +118,7 @@
     print("Create virtualenv export_path : %s - remote venvpath : %s" % (remote_venv_export_path, remotevirtualenvpath))
     activate_path = os.path.join(remotevirtualenvpath, "bin/activate")
     if "remote_baseline_venv" in env and env.remote_baseline_venv:
-        prefix_str = os.path.join(env.remote_baseline_venv, "bin/activate")
+        prefix_str = "source \"%s\"" % os.path.join(env.remote_baseline_venv, "bin/activate")
     else:
         prefix_str = "echo"
     run("mkdir -p \"%s\"" % remotevirtualenvpath)
@@ -150,7 +150,7 @@
 def relaunch_server():
     print("Relaunch server")
     collectstatic(env.remote_web_path, env.remote_virtualenv_path)
-    sudo(env.web_relaunch_cmd)
+    sudo(env.web_relaunch_cmd, shell=False)
 
 @task
 def sync_web(version):
diff -r 7d5640606813 -r b419e891b0bd virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Fri May 25 16:33:16 2012 +0200
+++ b/virtualenv/res/lib/lib_create_env.py	Fri May 25 16:40:12 2012 +0200
@@ -32,7 +32,7 @@
     'SORL_THUMBNAIL' : { 'setup': 'sorl-thumbnail', 'url':'http://pypi.python.org/packages/source/s/sorl-thumbnail/sorl-thumbnail-11.12.tar.gz', 'local':"sorl-thumbnail-v10.12.1.tar.gz"},
     'LIBJPEG': {'setup': None, 'url':'jpegsrc.v8d.tar.gz', 'local':'jpegsrc.v8d.tar.gz'},
     'ZLIB': {'setup': None, 'url':'zlib-1.2.6.tar.gz', 'local':'zlib-1.2.6.tar.gz'},
-    'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.5.tar.gz', 'local':'pycrypto-2.5.tar.gz'},
+    'PYCRYPTO': {'setup': 'pycrypto', 'url':'https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-2.6.tar.gz', 'local':'pycrypto-2.6.tar.gz'},
     'SSH': {'setup': 'ssh', 'url':'http://pypi.python.org/packages/source/s/ssh/ssh-1.7.13.tar.gz#md5=26800ef2c1ee3f185f48fd05258302f4', 'local':'ssh-1.7.13.tar.gz'},
     'FABRIC': {'setup': 'fabric', 'url':'https://github.com/fabric/fabric/tarball/1.4.1', 'local':'fabric-1.4.1.tar.gz'},
     'MERCURIAL': {'setup': 'mercurial', 'url':'http://mercurial.selenic.com/release/mercurial-2.2.1.tar.gz', 'local':'mercurial-2.2.1.tar.gz'},
diff -r 7d5640606813 -r b419e891b0bd virtualenv/res/src/pycrypto-2.5.tar.gz
Binary file virtualenv/res/src/pycrypto-2.5.tar.gz has changed