Package: ros-rosinstall / 0.7.8-4

0006-Switch-generated-setup.sh-to-Python-3.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 28 Sep 2019 08:06:24 +0200
Subject: Switch generated setup.sh to Python 3

---
 src/rosinstall/setupfiles.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rosinstall/setupfiles.py b/src/rosinstall/setupfiles.py
index c46d9af..702c0f2 100644
--- a/src/rosinstall/setupfiles.py
+++ b/src/rosinstall/setupfiles.py
@@ -196,7 +196,7 @@ unset _SETUP_SH_ERROR
 # We store into _PARSED_CONFIG the result of python code,
 # which is the ros_package_path and the list of setup_files to source
 # Using python here to benefit of the pyyaml library
-export _PARSED_CONFIG=`/usr/bin/env python << EOPYTHON
+export _PARSED_CONFIG=`/usr/bin/env python3 << EOPYTHON
 
 %(pycode)s
 EOPYTHON`
@@ -249,7 +249,7 @@ unset _SETUPFILES_ROSINSTALL
 
 # prepend elements from .rosinstall file to ROS_PACKAGE_PATH
 # ignoring duplicates entries from value set by setup files
-export ROS_PACKAGE_PATH=`/usr/bin/env python << EOPYTHON
+export ROS_PACKAGE_PATH=`/usr/bin/env python3 << EOPYTHON
 import os
 ros_package_path = os.environ.get('ROS_PACKAGE_PATH', '')
 original_elements = ros_package_path.split(':')
@@ -271,7 +271,7 @@ export ROS_WORKSPACE=%(wspath)s
 # if setup.sh did not set ROS_ROOT (pre-fuerte)
 if [ -z "${ROS_ROOT}" ]; then
   # using ROS_ROOT now being in ROS_PACKAGE_PATH
-  export _ROS_ROOT_ROSINSTALL=`/usr/bin/env python << EOPYTHON
+  export _ROS_ROOT_ROSINSTALL=`/usr/bin/env python3 << EOPYTHON
 import sys, os;
 if 'ROS_PACKAGE_PATH' in os.environ:
   pkg_path = os.environ['ROS_PACKAGE_PATH']