Merge pull request #2 from stertingen/fix_python_version

Fix ROS_PYTHON_VERSION env hook. Fix #1

2 files changed, 5 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c3f582210df..5810d9c52c99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-melodic-ros-environment
 	pkgdesc = ROS - The package provides the environment variables ROS_VERSION, ROS_DISTRO, ROS_PACKAGE_PATH, and ROS_ETC_DIR.
 	pkgver = 1.2.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://wiki.ros.org/ros_environment
 	arch = any
 	license = Apache License 2.0
diff --git a/PKGBUILD b/PKGBUILD
index 9c29d9d6aa6c..23defb407f36 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ url='https://wiki.ros.org/ros_environment'
 pkgname='ros-melodic-ros-environment'
 pkgver='1.2.1'
 arch=('any')
-pkgrel=2
+pkgrel=3
 license=('Apache License 2.0')
 
 ros_makedepends=(
@@ -42,6 +42,9 @@ build() {
 	# Fix Python2/Python3 conflicts.
 	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
 
+	# Set python version for env hook
+	ROS_PYTHON_VERSION=3
+
 	# Build the project.
 	cmake ${srcdir}/${_dir} \
 		-DCMAKE_BUILD_TYPE=Release \