| 1 |
commit: 7ac50d6aefdbce6975819fed24ba04f2f174a3f2 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 30 14:57:15 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 30 15:02:34 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac50d6a |
| 7 |
|
| 8 |
dev-util/catkin: fix patch for when env is unset |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/629596 |
| 11 |
Closes: https://bugs.gentoo.org/677628 |
| 12 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 13 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch | 2 +- |
| 16 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch |
| 19 |
index ae468b21c01..6ad761f8421 100644 |
| 20 |
--- a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch |
| 21 |
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch |
| 22 |
@@ -22,7 +22,7 @@ Index: catkin-0.7.17/python/catkin/builder.py |
| 23 |
'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'", |
| 24 |
'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')", |
| 25 |
'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)), |
| 26 |
-+ 'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)), |
| 27 |
++ 'CATKIN_PREFIX_PATH': ';'.join(os.environ.get('CATKIN_PREFIX_PATH','').split(os.pathsep)), |
| 28 |
'PYTHON_EXECUTABLE': sys.executable, |
| 29 |
'PYTHON_INSTALL_DIR': get_python_install_dir(), |
| 30 |
} |
Archives