Merge branch 'release/0.9.60'

klen · Aug 12, 2012 · c86de68 · c86de68
2 parents a7fea42 + 9e07920
commit c86de68
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,7 +1,7 @@
 CHANGES
 =======
 
-## 2012-08-21 0.9.59
+## 2012-08-21 0.9.60
 --------------------
 * 'git_user', 'hg_user' and etc support
 

diff --git a/makesite/settings.py b/makesite/settings.py
@@ -1,7 +1,7 @@
 from os import path as op, environ, getenv
 
 
-VERSION = '0.9.59'
+VERSION = '0.9.60'
 
 BASEDIR = op.abspath(op.dirname(__file__))
 TPL_DIR = op.join(BASEDIR, 'templates')

diff --git a/makesite/templates/virtualenv/service/virtualenv_install.sh.tmpl b/makesite/templates/virtualenv/service/virtualenv_install.sh.tmpl
@@ -10,6 +10,7 @@ EASY_INSTALL=$VIRTUALENVDIR/bin/easy_install
 
 # Change rights
 sudo chown -R $USER:$USER $DEPLOY_DIR
+sudo rm -rf /tmp/.pip
 
 echo "Create virtualenv: $VIRTUALENVDIR"
 cmd_or_die "virtualenv --no-site-packages $VIRTUALENVDIR"

diff --git a/makesite/templates/virtualenv/service/virtualenv_update.sh.tmpl b/makesite/templates/virtualenv/service/virtualenv_update.sh.tmpl
@@ -13,6 +13,7 @@ REQ_SUM=$(md5sum $PIP_PROJECTFILE)
 OLD_REQ_SUM=$(cat $VIRTUALENVDIR/.reqsum)
 
 cmd_or_die "sudo chown -R $USER:$USER $VIRTUALENVDIR"
+sudo rm -rf /tmp/.pip
 
 if [ -f $PIP_PROJECTFILE ]; then