diff options
| author | Benjamin Chrétien | 2014-07-06 16:28:42 +0200 |
|---|---|---|
| committer | Benjamin Chrétien | 2014-07-06 16:28:42 +0200 |
| commit | 584623590a64a24f87b7a9a425713ade3e173c39 (patch) | |
| tree | b893deb72a37cccfe32886f9d5a3af6e5c766a21 | |
| parent | cc1bb9328eaad12ce1e141da78274a0bf096a1ca (diff) | |
| download | aur-584623590a64a24f87b7a9a425713ade3e173c39.tar.gz | |
Add some updates.
| -rw-r--r-- | python.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/python.patch b/python.patch deleted file mode 100644 index 3dfa5851e812..000000000000 --- a/python.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 |