From aaa72b2a25b7869492eb1ed913bac254ecc2d982 Mon Sep 17 00:00:00 2001 From: stmoon Date: Sun, 15 Mar 2020 21:43:16 +0900 Subject: [PATCH] change how to get ros2 version --- msg/tools/generate_microRTPS_bridge.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/msg/tools/generate_microRTPS_bridge.py b/msg/tools/generate_microRTPS_bridge.py index 67a79354e3..0309ecc1c0 100644 --- a/msg/tools/generate_microRTPS_bridge.py +++ b/msg/tools/generate_microRTPS_bridge.py @@ -264,18 +264,15 @@ fastrtps_version = subprocess.check_output( "ldconfig -v | grep libfastrtps", shell=True).decode("utf-8").strip().split('so.')[-1] # get ROS 2 version, if exists -ros2_distro = "" -try: - rosversion_out = subprocess.check_output(["rosversion", "-d"]) - rosversion_out = rosversion_out.rstrip().decode('utf-8') - if rosversion_out not in ["", "kinetic", "lunar", "melodic"]: - ros2_distro = rosversion_out -except OSError as e: - if e.errno == errno.ENOENT: - if args.ros2_distro != None: - ros2_distro = args.ros2_distro - else: - raise +ros2_distro = '' +ros_version = os.environ.get('ROS_VERSION') +if ros_version == '2' : + if args.ros2_distro != '': + ros2_distro = args.ros2_distro + else : + ros2_distro = os.environ.get('ROS_DISTRO') +else : + raise ValueError # If nothing specified it's generated both if agent == False and client == False: