diff options
Diffstat (limited to 'dev-python/catkin_pkg/files/infinite_loop4.patch')
| -rw-r--r-- | dev-python/catkin_pkg/files/infinite_loop4.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/dev-python/catkin_pkg/files/infinite_loop4.patch b/dev-python/catkin_pkg/files/infinite_loop4.patch deleted file mode 100644 index affb67bb8367..000000000000 --- a/dev-python/catkin_pkg/files/infinite_loop4.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=612860 -By Tim Rakowski -We os.walk /usr with followlinks=True, but at least nodejs contains a "recursive" link in /usr/include/node - -Index: catkin_pkg-0.4.20/src/catkin_pkg/packages.py -=================================================================== ---- catkin_pkg-0.4.20.orig/src/catkin_pkg/packages.py -+++ catkin_pkg-0.4.20/src/catkin_pkg/packages.py -@@ -57,7 +57,9 @@ def find_package_paths(basepath, exclude - """ - paths = [] - real_exclude_paths = [os.path.realpath(p) for p in exclude_paths] if exclude_paths is not None else [] -+ visited = set() - for dirpath, dirnames, filenames in os.walk(basepath, followlinks=True): -+ visited.add(dirpath) - if set(dirnames + filenames) & {'AMENT_IGNORE', 'CATKIN_IGNORE', 'COLCON_IGNORE'} or \ - os.path.realpath(dirpath) in real_exclude_paths or \ - (exclude_subspaces and '.catkin' in filenames): -@@ -68,7 +70,7 @@ def find_package_paths(basepath, exclude - del dirnames[:] - continue - # filter out hidden directories in-place -- dirnames[:] = [d for d in dirnames if not d.startswith('.')] -+ dirnames[:] = [d for d in dirnames if not d.startswith('.') and not os.path.realpath(os.path.join(dirpath, d)) in visited] - return paths - - |