File: 0002-Add-usr-share-as-default-ROS_PACKAGE_PATH.patch

package info (click to toggle)
ros-rospack 2.6.4-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 964 kB
  • sloc: cpp: 3,580; xml: 251; python: 35; ansic: 34; sh: 16; makefile: 3
file content (22 lines) | stat: -rw-r--r-- 599 bytes parent folder | download | duplicates (2) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
 
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Fri, 12 Dec 2014 07:48:34 +0100
Subject: Add usr/share as default ROS_PACKAGE_PATH

---
 src/rospack.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/rospack.cpp b/src/rospack.cpp
index 3a83fce..52fffb3 100644
--- a/src/rospack.cpp
+++ b/src/rospack.cpp
@@ -305,6 +305,9 @@ Rosstackage::getSearchPathFromEnv(std::vector<std::string>& sp)
       sp.push_back(*it);
     }
   }
+  char* ignore_usr = getenv("ROSPACK_NO_IMPLICIT_USR");
+  if (!ignore_usr || !ignore_usr[0])
+    sp.push_back("/usr/share/");
   return true;
 }