diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2018-05-15 08:34:50 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2018-05-15 08:34:50 +0200 |
| commit | acd83790f473073286a1834a978129c6adc703e1 (patch) | |
| tree | 0bb092e0cede9bf45c2b166daaad4961d309e131 /dev-python/catkin_pkg/files | |
| parent | dev-ros/interactive_markers: bump to 1.11.4 (diff) | |
| download | gentoo-acd83790f473073286a1834a978129c6adc703e1.tar.gz gentoo-acd83790f473073286a1834a978129c6adc703e1.tar.bz2 gentoo-acd83790f473073286a1834a978129c6adc703e1.zip | |
dev-python/catkin_pkg: bump to 0.4.2 and fix tests
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Diffstat (limited to 'dev-python/catkin_pkg/files')
| -rw-r--r-- | dev-python/catkin_pkg/files/catkin_prefix.patch | 2 | ||||
| -rw-r--r-- | dev-python/catkin_pkg/files/ros_packages.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dev-python/catkin_pkg/files/catkin_prefix.patch b/dev-python/catkin_pkg/files/catkin_prefix.patch index c5f40db51cd1..fe9cc347882b 100644 --- a/dev-python/catkin_pkg/files/catkin_prefix.patch +++ b/dev-python/catkin_pkg/files/catkin_prefix.patch @@ -19,7 +19,7 @@ Index: catkin_pkg-0.2.8/src/catkin_pkg/workspaces.py if paths is None: - if 'CMAKE_PREFIX_PATH' not in os.environ: - raise RuntimeError('Neither the environment variable CMAKE_PREFIX_PATH is set nor was a list of paths passed.') -+ if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ : ++ if 'CMAKE_PREFIX_PATH' not in os.environ and 'CATKIN_PREFIX_PATH' not in os.environ: + raise RuntimeError('None of the environment variables CMAKE_PREFIX_PATH or CATKIN_PREFIX_PATH are set nor was a list of paths passed.') paths = os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep) if os.environ['CMAKE_PREFIX_PATH'] else [] + paths += os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep) if os.environ['CATKIN_PREFIX_PATH'] else [] diff --git a/dev-python/catkin_pkg/files/ros_packages.patch b/dev-python/catkin_pkg/files/ros_packages.patch index 6c9855d627c9..06933d69a9fa 100644 --- a/dev-python/catkin_pkg/files/ros_packages.patch +++ b/dev-python/catkin_pkg/files/ros_packages.patch @@ -7,7 +7,7 @@ Index: catkin_pkg-0.3.1/src/catkin_pkg/packages.py continue elif PACKAGE_MANIFEST_FILENAME in filenames: - paths.append(os.path.relpath(dirpath, basepath)) -+ paths.append(os.path.relpath(dirpath.replace('ros_packages/',''), basepath)) ++ paths.append(os.path.relpath(dirpath.replace('ros_packages/', ''), basepath)) del dirnames[:] continue for dirname in dirnames: |