diff options
Diffstat (limited to 'python.patch')
| -rw-r--r-- | python.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/python.patch b/python.patch new file mode 100644 index 000000000000..3dfa5851e812 --- /dev/null +++ b/python.patch @@ -0,0 +1,28 @@ +commit 61ce004a566ed0840eca442a8b806a212f59e952 +Author: Benjamin Chrétien <chretien@lirmm.fr> +Date: Sat Jun 7 17:01:55 2014 +0200 + + Fix Python 2 call in hook. + +diff --git a/env-hooks/10.ros.sh.em b/env-hooks/10.ros.sh.em +index 86fa0c4..73a78be 100644 +--- a/env-hooks/10.ros.sh.em ++++ b/env-hooks/10.ros.sh.em +@@ -1,7 +1,7 @@ + # generated from ros/env-hooks/10.ros.sh.em + + # scrub old ROS bin dirs, to avoid accidentally finding the wrong executables +-export PATH="`python -c \"import os; print(os.pathsep.join([x for x in \\\"$PATH\\\".split(os.pathsep) if not any([d for d in ['cturtle', 'diamondback', 'electric', 'fuerte'] if d in x])]))\"`" ++export PATH="`python2 -c \"import os; print(os.pathsep.join([x for x in \\\"$PATH\\\".split(os.pathsep) if not any([d for d in ['cturtle', 'diamondback', 'electric', 'fuerte'] if d in x])]))\"`" + + if [ -n "$ROS_DISTRO" -a "$ROS_DISTRO" != "indigo" ]; then + echo "ROS_DISTRO was set to '$ROS_DISTRO' before. Please make sure that the environment does not mix paths from different distributions." +@@ -30,7 +30,7 @@ for workspace in workspaces: + print(os.pathsep.join(paths)) + EOF + ) +-export ROS_PACKAGE_PATH="`python -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`" ++export ROS_PACKAGE_PATH="`python2 -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`" + + @[if DEVELSPACE]@ + # env variables in develspace |