diff options
author | Alexis Ballier <aballier@gentoo.org> | 2017-08-15 08:02:55 +0200 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2017-08-15 08:25:27 +0200 |
commit | 6056b6c389d1e688c600172d00247145869bcbf2 (patch) | |
tree | 13c74bf92bf9c6b333aa294cf5becd9a6df2d349 /dev-python/catkin_pkg/files | |
parent | dev-python/catkin_pkg: bump to 0.3.6 and update infinite loop patch (diff) | |
download | gentoo-6056b6c389d1e688c600172d00247145869bcbf2.tar.gz gentoo-6056b6c389d1e688c600172d00247145869bcbf2.tar.bz2 gentoo-6056b6c389d1e688c600172d00247145869bcbf2.zip |
dev-python/catkin_pkg: Remove old
Package-Manager: Portage-2.3.7, Repoman-2.3.3
Diffstat (limited to 'dev-python/catkin_pkg/files')
-rw-r--r-- | dev-python/catkin_pkg/files/infinite_loop.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/dev-python/catkin_pkg/files/infinite_loop.patch b/dev-python/catkin_pkg/files/infinite_loop.patch deleted file mode 100644 index 7aa3084efa0b..000000000000 --- a/dev-python/catkin_pkg/files/infinite_loop.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.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 - |