diff --git a/msg/tools/generate_microRTPS_bridge.py b/msg/tools/generate_microRTPS_bridge.py index 923e0b9beaa5..c75eb8f237de 100644 --- a/msg/tools/generate_microRTPS_bridge.py +++ b/msg/tools/generate_microRTPS_bridge.py @@ -236,18 +236,15 @@ def check_rtps_id_uniqueness(classifier): print("No valid version found to FasRTPS. Make sure it is installed.") # 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: