add --first-only option to catkin_find invocation to be defensive (#83)

ros · Jun 9, 2015 · bd49938 · bd49938
1 parent a475c05
commit bd49938
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tools/rosbash/rosbash b/tools/rosbash/rosbash
@@ -233,7 +233,7 @@ function rosls {
 function _roscmd {
     local pkgdir exepath opt catkin_package_libexec_dir opts
     if [[ -n $CMAKE_PREFIX_PATH ]]; then
-        catkin_package_libexec_dir=`catkin_find --without-underlays --libexec $1 2> /dev/null`
+        catkin_package_libexec_dir=`catkin_find --first-only --without-underlays --libexec $1 2> /dev/null`
     fi
     pkgdir=`_ros_package_find $1`
     if [[ -z $catkin_package_libexec_dir && -z $pkgdir ]]; then
@@ -435,7 +435,7 @@ function _roscomplete_find {
     local pkg=${2}
     local arg=${3}
     if [[ -n $CMAKE_PREFIX_PATH ]]; then
-        catkin_package_libexec_dir=`catkin_find --without-underlays --libexec ${pkg} 2> /dev/null`
+        catkin_package_libexec_dir=`catkin_find --first-only --without-underlays --libexec ${pkg} 2> /dev/null`
     fi
     pkgdir=`_ros_package_find ${pkg}`
     if [[ -n "$catkin_package_libexec_dir" || -n "$pkgdir" ]]; then

diff --git a/tools/rosbash/roszsh b/tools/rosbash/roszsh
@@ -318,7 +318,7 @@ function _roscomplete_search_dir {
     fi
     pkgdir=`export ROS_CACHE_TIMEOUT=-1.0 && rospack find ${pkg} 2> /dev/null`
     pkgdir_result=$?
-    catkin_package_libexec_dir=`catkin_find --without-underlays --libexec ${pkg} 2> /dev/null`
+    catkin_package_libexec_dir=`catkin_find --first-only --without-underlays --libexec ${pkg} 2> /dev/null`
     if [[ $? != 0 ]]
     then
         catkin_package_libexec_dir=""