[gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/files/

["Alexis Ballier" <aballier@gentoo.org>]

commit:     7ac50d6aefdbce6975819fed24ba04f2f174a3f2
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 14:57:15 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 15:02:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ac50d6a

dev-util/catkin: fix patch for when env is unset

Closes: https://bugs.gentoo.org/629596
Closes: https://bugs.gentoo.org/677628
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index ae468b21c01..6ad761f8421 100644
--- a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
@@ -22,7 +22,7 @@ Index: catkin-0.7.17/python/catkin/builder.py
                      'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
                      'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
                      'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
-+                    'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
++                    'CATKIN_PREFIX_PATH': ';'.join(os.environ.get('CATKIN_PREFIX_PATH','').split(os.pathsep)),
                      'PYTHON_EXECUTABLE': sys.executable,
                      'PYTHON_INSTALL_DIR': get_python_install_dir(),
                  }