blob: affb67bb83671a50665d6f53347bfb71548ba9a6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
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.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
|
GitWeb
