From fb19df8587b3be82ebc699d23972f147e13c2376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven!=20Ragnar=C3=B6k?= Date: Thu, 10 Oct 2019 15:21:20 -0400 Subject: [PATCH] Add ROS_PYTHON_VERSION to conditional context. --- bloom/generators/common.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/bloom/generators/common.py b/bloom/generators/common.py index 2bfabbed..f107eefb 100644 --- a/bloom/generators/common.py +++ b/bloom/generators/common.py @@ -42,6 +42,7 @@ from bloom.rosdistro_api import get_distribution_type from bloom.rosdistro_api import get_index +from bloom.rosdistro_api import get_python_version from bloom.util import code from bloom.util import maybe_continue @@ -139,9 +140,19 @@ def package_conditional_context(ros_distro): else: error("Bloom cannot cope with distribution_type '{0}'".format( distribution_type), exit=True) + python_version = get_python_version(ros_distro) + if python_version == 2: + ros_python_version = '2' + elif python_version == 3: + ros_python_version = '3' + else: + error("Bloom cannot cope with python_version '{0}'".format( + python_version), exit=True) + return { 'ROS_VERSION': ros_version, 'ROS_DISTRO': ros_distro, + 'ROS_PYTHON_VERSION': ros_python_version, }