[ros-rospkg] 01/01: Revert applied patches to upstream source

[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-rospkg.

commit 6f6e787f2b36d6324745999ab7ccd8fe545dc102
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Nov 19 11:19:57 2015 +0100

    Revert applied patches to upstream source
---
 scripts/rosversion        | 2 +-
 src/rospkg/environment.py | 2 +-
 src/rospkg/rospack.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/rosversion b/scripts/rosversion
index bfd4a11..78f0677 100755
--- a/scripts/rosversion
+++ b/scripts/rosversion
@@ -75,7 +75,7 @@ if len(sys.argv) == 2:
         else:
             distro_name = get_distro_name_from_roscore()
         if not distro_name:
-            print('Debian')
+            print('<unknown>')
         else:
             print(distro_name)
         sys.exit(0)
diff --git a/src/rospkg/environment.py b/src/rospkg/environment.py
index ce340e8..63b7abc 100644
--- a/src/rospkg/environment.py
+++ b/src/rospkg/environment.py
@@ -109,7 +109,7 @@ def get_ros_package_path(env=None):
     """
     if env is None:
         env = os.environ
-    return env.get(ROS_PACKAGE_PATH, '') + ':/usr/share'
+    return env.get(ROS_PACKAGE_PATH, None)
 
 def get_ros_home(env=None):
     """
diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
index 1c61192..8050f5f 100644
--- a/src/rospkg/rospack.py
+++ b/src/rospkg/rospack.py
@@ -89,7 +89,7 @@ def list_by_path(manifest_name, path, cache):
             # optimization for stacks.
             del dirs[:]
             continue #leaf     
-        elif 'rospack_nosubdirs' in files or d.startswith('/usr/share/'):
+        elif 'rospack_nosubdirs' in files:
             del dirs[:]
             continue  #leaf
         # remove hidden dirs (esp. .svn/.git)

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