[ros-ros] 01/02: Add patch for rosrun nodelet nodelet

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-ros.

commit 9a5b80b3eb3e8aa7dded9dd6d536e5ea838330af
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu May 26 14:46:35 2016 +0200

    Add patch for rosrun nodelet nodelet
---
 .../0007-Always-use-catkin_find-in-rosrun.patch    | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/debian/patches/0007-Always-use-catkin_find-in-rosrun.patch b/debian/patches/0007-Always-use-catkin_find-in-rosrun.patch
new file mode 100644
index 0000000..b0b0bac
--- /dev/null
+++ b/debian/patches/0007-Always-use-catkin_find-in-rosrun.patch
@@ -0,0 +1,35 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Thu, 26 May 2016 14:44:53 +0200
+Subject: Always use catkin_find in rosrun
+
+On Debian we are sure to have a catkin workspace, even though
+CMAKE_PREFIX_PATH is not set. This fixes:
+
+rosrun nodelet nodelet
+---
+ tools/rosbash/scripts/rosrun | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tools/rosbash/scripts/rosrun b/tools/rosbash/scripts/rosrun
+index 7ec36d9..7dd96a2 100755
+--- a/tools/rosbash/scripts/rosrun
++++ b/tools/rosbash/scripts/rosrun
+@@ -47,12 +47,12 @@ case $2 in
+     ;;
+ esac
+ 
+-if [[ -n $CMAKE_PREFIX_PATH ]]; then
+-  IFS=$'\n'
+-  catkin_package_libexec_dirs=(`catkin_find --without-underlays --libexec --share "$1" 2> /dev/null`)
+-  unset IFS
+-  debug "Looking in catkin libexec dirs: $catkin_package_libexec_dirs"
+-fi
++
++IFS=$'\n'
++catkin_package_libexec_dirs=(`catkin_find --without-underlays --libexec --share "$1" 2> /dev/null`)
++unset IFS
++debug "Looking in catkin libexec dirs: $catkin_package_libexec_dirs"
++
+ pkgdir=`rospack find "$1"`
+ debug "Looking in rospack dir: $pkgdir"
+ if [[ ${#catkin_package_libexec_dirs[@]} -eq 0 && -z $pkgdir ]]; then
diff --git a/debian/patches/series b/debian/patches/series
index e97aa32..6beacf2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0005-Sat-ROS_ROOT-for-rosmake-if-it-s-not-set.patch
 0005-Fix-location-of-etc-ros-dir.patch
 0006-Add-default-ROS_ROOT-to-rosmake.patch
+0007-Always-use-catkin_find-in-rosrun.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-ros.git