[ros-rospkg] 02/06: Rebase patches

[Jochen Sprickerhof]

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

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

commit 63f5607c321d6870990a905437eb0ddae35724f3
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Jun 23 20:43:31 2017 +0200

    Rebase patches
---
 .../0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch | 16 ++++++++--------
 debian/patches/0002-Limit-search-in-usr-share.patch      |  8 ++++----
 debian/patches/0003-Set-rosversion-to-Debian.patch       |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch b/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
index 00ea333..098d7fe 100644
--- a/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
+++ b/debian/patches/0001-Set-default-ROS_PACKAGE_PATH-to-usr-share.patch
@@ -8,27 +8,27 @@ Subject: Set default ROS_PACKAGE_PATH to /usr/share
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/rospkg/environment.py b/src/rospkg/environment.py
-index 63b7abc..ce340e8 100644
+index e807978..f05b563 100644
 --- a/src/rospkg/environment.py
 +++ b/src/rospkg/environment.py
-@@ -109,7 +109,7 @@ def get_ros_package_path(env=None):
+@@ -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 5f67159..1f8532b 100644
+index 2e44ce0..5512814 100644
 --- a/test/test_rospkg_environment.py
 +++ b/test/test_rospkg_environment.py
-@@ -54,13 +54,13 @@ def test_get_ros_root():
-     
+@@ -52,13 +52,13 @@ def test_get_ros_root():
+ 
  def test_get_ros_package_path():
      from rospkg import get_ros_package_path
--    assert None == get_ros_package_path(env={})
+-    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)
@@ -39,5 +39,5 @@ index 5f67159..1f8532b 100644
 -    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():
-     from rospkg import get_log_dir, get_ros_root
diff --git a/debian/patches/0002-Limit-search-in-usr-share.patch b/debian/patches/0002-Limit-search-in-usr-share.patch
index 9e2a52d..7d810a7 100644
--- a/debian/patches/0002-Limit-search-in-usr-share.patch
+++ b/debian/patches/0002-Limit-search-in-usr-share.patch
@@ -9,15 +9,15 @@ ROS packages.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
-index 8050f5f..1c61192 100644
+index c0601bf..00b1ca5 100644
 --- a/src/rospkg/rospack.py
 +++ b/src/rospkg/rospack.py
-@@ -89,7 +89,7 @@ def list_by_path(manifest_name, path, cache):
+@@ -91,7 +91,7 @@ def list_by_path(manifest_name, path, cache):
              # optimization for stacks.
              del dirs[:]
-             continue #leaf     
+             continue  # leaf
 -        elif 'rospack_nosubdirs' in files:
 +        elif 'rospack_nosubdirs' in files or d.startswith('/usr/share/'):
              del dirs[:]
-             continue  #leaf
+             continue   # leaf
          # remove hidden dirs (esp. .svn/.git)
diff --git a/debian/patches/0003-Set-rosversion-to-Debian.patch b/debian/patches/0003-Set-rosversion-to-Debian.patch
index bf511a0..29b9acd 100644
--- a/debian/patches/0003-Set-rosversion-to-Debian.patch
+++ b/debian/patches/0003-Set-rosversion-to-Debian.patch
@@ -7,10 +7,10 @@ Subject: Set rosversion to Debian
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scripts/rosversion b/scripts/rosversion
-index 78f0677..bfd4a11 100755
+index 7566761..58cfe18 100755
 --- a/scripts/rosversion
 +++ b/scripts/rosversion
-@@ -75,7 +75,7 @@ if len(sys.argv) == 2:
+@@ -77,7 +77,7 @@ if len(sys.argv) == 2:
          else:
              distro_name = get_distro_name_from_roscore()
          if not distro_name:

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