diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-15 13:19:56 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-15 13:19:56 +0100 |
| commit | d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch) | |
| tree | 2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /dev-python/catkin_pkg/files/catkin_prefix.patch | |
| parent | ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff) | |
gentoo resync : 15.05.2018
Diffstat (limited to 'dev-python/catkin_pkg/files/catkin_prefix.patch')
| -rw-r--r-- | dev-python/catkin_pkg/files/catkin_prefix.patch | 2 |
1 files changed, 1 insertions, 1 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 [] |