From c017174e78a347c3bf37186781b2ae516fb64678 Mon Sep 17 00:00:00 2001
From: Dominique Hunziker <dominique.hunziker@gmail.com>
Date: Sat, 5 May 2018 21:48:00 +0200
Subject: [PATCH] fix faulty PR #581

PYTHON_PN is not equal to 'python2' for Python 2 but 'python'.
---
 recipes-ros/catkin/catkin-runtime_0.6.19.bb | 2 +-
 recipes-ros/ros-comm/roslaunch_1.11.21.bb   | 2 +-
 recipes-ros/rospack/rospack_2.2.8.bb        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-ros/catkin/catkin-runtime_0.6.19.bb b/recipes-ros/catkin/catkin-runtime_0.6.19.bb
index 28815f6..aea433d 100644
--- a/recipes-ros/catkin/catkin-runtime_0.6.19.bb
+++ b/recipes-ros/catkin/catkin-runtime_0.6.19.bb
@@ -18,7 +18,7 @@ RDEPENDS_${PN}_class-native = ""
 RDEPENDS_${PN} = "\
     ${PYTHON_PN}-catkin-pkg ${PYTHON_PN}-misc ${PYTHON_PN}-multiprocessing \
     ${PYTHON_PN}-shell ${PYTHON_PN}-xml ${PYTHON_PN}-pkgutil \
-    ${@'python-argparse python-subprocess' if d.getVar('PYTHON_PN', True) == 'python2' else ''}"
+    ${@'python-argparse python-subprocess' if d.getVar('PYTHON_PN', True) == 'python' else ''}"
 
 # Delete everything but the python packages in order to avoid
 # that the QA error [installed-vs-shipped] hits on us.
diff --git a/recipes-ros/ros-comm/roslaunch_1.11.21.bb b/recipes-ros/ros-comm/roslaunch_1.11.21.bb
index 2b49148..069d675 100644
--- a/recipes-ros/ros-comm/roslaunch_1.11.21.bb
+++ b/recipes-ros/ros-comm/roslaunch_1.11.21.bb
@@ -16,7 +16,7 @@ SRC_URI += "file://0001-increase-rosmaster-timeout.patch;patchdir=../.. \
 ROS_PKG_SUBDIR = "tools"
 
 RDEPENDS_${PN} = "\
-    ${@'python-textutils' if d.getVar('PYTHON_PN', True) == 'python2' else ''} \
+    ${@'python-textutils' if d.getVar('PYTHON_PN', True) == 'python' else ''} \
     ${PYTHON_PN}-logging \
     ${PYTHON_PN}-threading \
     ${PYTHON_PN}-rospkg \
diff --git a/recipes-ros/rospack/rospack_2.2.8.bb b/recipes-ros/rospack/rospack_2.2.8.bb
index 80a7fed..e07e214 100644
--- a/recipes-ros/rospack/rospack_2.2.8.bb
+++ b/recipes-ros/rospack/rospack_2.2.8.bb
@@ -14,4 +14,4 @@ SRC_URI[sha256sum] = "a8fecbe03f9757510fe47137642e39a7c31b823d5bf7fa7890acc11691
 inherit catkin
 
 RDEPENDS_${PN} = "${PYTHON_PN}-rosdep \
-                  ${@'python-subprocess' if d.getVar('PYTHON_PN', True) == 'python2' else ''}"
+                  ${@'python-subprocess' if d.getVar('PYTHON_PN', True) == 'python' else ''}"