1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Wed, 8 Apr 2015 18:01:46 +0200
Subject: Set default ROS_PACKAGE_PATH to /usr/share
---
src/rospkg/environment.py | 2 +-
test/test_rospkg_environment.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/rospkg/environment.py b/src/rospkg/environment.py
index e807978..f05b563 100644
--- a/src/rospkg/environment.py
+++ b/src/rospkg/environment.py
@@ -114,7 +114,7 @@ def get_ros_package_path(env=None):
"""
if env is None:
env = os.environ
- return env.get(ROS_PACKAGE_PATH, None)
+ return env.get(ROS_PACKAGE_PATH, '') + ':/usr/share'
def get_ros_home(env=None):
diff --git a/test/test_rospkg_environment.py b/test/test_rospkg_environment.py
index 2e44ce0..5512814 100644
--- a/test/test_rospkg_environment.py
+++ b/test/test_rospkg_environment.py
@@ -52,13 +52,13 @@ def test_get_ros_root():
def test_get_ros_package_path():
from rospkg import get_ros_package_path
- assert get_ros_package_path(env={}) is None
+ assert ':/usr/share' == get_ros_package_path(env={})
env = {'ROS_PACKAGE_PATH': ':'}
- assert ':' == get_ros_package_path(env=env)
+ assert '::/usr/share' == get_ros_package_path(env=env)
# trip-wire tests. Cannot guarantee that ROS_PACKAGE_PATH is set
# to valid value on test machine, just make sure logic doesn't crash
- assert os.environ.get('ROS_PACKAGE_PATH', None) == get_ros_package_path()
+ assert os.environ.get('ROS_PACKAGE_PATH', ':/usr/share') == get_ros_package_path()
def test_get_log_dir():
|
