diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
tree | 8c816148bcbd22757d892089c989ae614eae4f5a /dev-python/catkin_pkg/files | |
parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) |
gentoo resync : 09.07.2022
Diffstat (limited to 'dev-python/catkin_pkg/files')
-rw-r--r-- | dev-python/catkin_pkg/files/infinite_loop5.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/dev-python/catkin_pkg/files/infinite_loop5.patch b/dev-python/catkin_pkg/files/infinite_loop5.patch new file mode 100644 index 000000000000..7f88da41a27d --- /dev/null +++ b/dev-python/catkin_pkg/files/infinite_loop5.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.5.2/src/catkin_pkg/packages.py +=================================================================== +--- catkin_pkg-0.5.2.orig/src/catkin_pkg/packages.py ++++ catkin_pkg-0.5.2/src/catkin_pkg/packages.py +@@ -61,7 +61,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) & ignore_markers or \ + os.path.realpath(dirpath) in real_exclude_paths or \ + (exclude_subspaces and '.catkin' in filenames): +@@ -72,7 +74,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 + + |