Merge lp:~zyga/checkbox/fix-1456560 into lp:checkbox

[Zygmunt Krynicki]

[Sylvain Pineau (sylvain-pineau)]

Good catch +1

review: Approve

[Daniel Manrique (roadmr)]

+1, thanks for fixing this, those scripts are getting really weird :)

review: Approve

=== modified file 'support/provision-testing-environment'
--- support/provision-testing-environment	2015-03-30 15:59:47 +0000
+++ support/provision-testing-environment	2015-05-19 11:10:04 +0000
@@ -103,6 +103,9 @@
     # default), so we need to create the home dir ourselves.
     [ ! -d $HOME ] && mkdir -p $HOME
     ln --no-dereference --force --symbolic $CHECKBOX_TOP $HOME/src
+fi
+
+# Patch pkg-resources to fix https://bugs.launchpad.net/plainbox/+bug/1456560
 if patch -p0 /usr/lib/python3/dist-packages/pkg_resources.py << EOF
 --- pkg_resources.py.orig	2014-05-15 19:39:38.365807720 +0000
 +++ pkg_resources.py	2014-05-15 19:44:50.449807720 +0000
@@ -135,8 +138,3 @@
 	echo "Patching pkg_resources.py failed"
 	echo "This is not necessarily bad, this is only needed on precise"
 fi
-
-fi
-
-
-