diff options
author | Alexis Ballier <aballier@gentoo.org> | 2017-04-25 08:39:55 +0200 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2017-04-25 08:40:16 +0200 |
commit | 1e2412c2e4b566936653e98e62d244efd5523848 (patch) | |
tree | 7c2879e3d298f32b73ba32864fa2b31ce373255f /dev-python/catkin_pkg/files | |
parent | ros-meta/rqt: Bump to 0.5.0. (diff) | |
download | gentoo-1e2412c2e4b566936653e98e62d244efd5523848.tar.gz gentoo-1e2412c2e4b566936653e98e62d244efd5523848.tar.bz2 gentoo-1e2412c2e4b566936653e98e62d244efd5523848.zip |
dev-python/catkin_pkg: Add patch by Tim Rakowski in bug #612860 to avoid infinite loop in crawling directories
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'dev-python/catkin_pkg/files')
-rw-r--r-- | dev-python/catkin_pkg/files/infinite_loop.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/dev-python/catkin_pkg/files/infinite_loop.patch b/dev-python/catkin_pkg/files/infinite_loop.patch new file mode 100644 index 000000000000..7aa3084efa0b --- /dev/null +++ b/dev-python/catkin_pkg/files/infinite_loop.patch @@ -0,0 +1,27 @@ +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.3.1/src/catkin_pkg/packages.py +=================================================================== +--- catkin_pkg-0.3.1.orig/src/catkin_pkg/packages.py ++++ catkin_pkg-0.3.1/src/catkin_pkg/packages.py +@@ -52,7 +52,9 @@ def find_package_paths(basepath, exclude_paths=None, exclude_subspaces=False): + """ + 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 'CATKIN_IGNORE' in filenames or \ + os.path.realpath(dirpath) in real_exclude_paths or \ + (exclude_subspaces and '.catkin' in filenames): +@@ -63,7 +65,7 @@ def find_package_paths(basepath, exclude_paths=None, exclude_subspaces=False): + del dirnames[:] + continue + for dirname in dirnames: +- if dirname.startswith('.'): ++ if dirname.startswith('.') or os.path.realpath(os.path.join(dirpath, dirname)) in visited: + dirnames.remove(dirname) + return paths + |