33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
|
From 4254977bbfc67a3083e3881a56b50b729bf57d9f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dominique Hunziker <dominique.hunziker@gmail.com>
|
||
|
|
Date: Fri, 2 Jun 2017 11:57:54 +0200
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
|
||
|
|
---
|
||
|
|
core/roslib/env-hooks/10.ros.sh.em | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/core/roslib/env-hooks/10.ros.sh.em b/core/roslib/env-hooks/10.ros.sh.em
|
||
|
|
index caed342..1c64fc4 100644
|
||
|
|
--- a/core/roslib/env-hooks/10.ros.sh.em
|
||
|
|
+++ b/core/roslib/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_EXECUTABLE) -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="`/usr/bin/env 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])]))\"`"
|
||
|
|
|
||
|
|
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_EXECUTABLE) -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`"
|
||
|
|
+export ROS_PACKAGE_PATH="`/usr/bin/env python -c \"$PYTHON_CODE_BUILD_ROS_PACKAGE_PATH\"`"
|
||
|
|
|
||
|
|
@[if DEVELSPACE]@
|
||
|
|
# env variables in develspace
|