[rospkg] 02/03: Limit search in /usr/share

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch patch-queue/master
in repository rospkg.

commit 7befd24fa49aec07c3c4acc3ee5ae0bae0de5061
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri May 8 12:02:21 2015 +0200

    Limit search in /usr/share
    
    os.walk would walk all paths. Let's just use /usr/share/<pkg-name> for
    ROS packages.
    
    Gbp-Pq: Name 0002-Limit-search-in-usr-share.patch
---
 src/rospkg/rospack.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rospkg/rospack.py b/src/rospkg/rospack.py
index e55acec..e21e243 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:
+        elif 'rospack_nosubdirs' in files or d.startswith('/usr/share/'):
             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/rospkg.git