1
1

Fix mca_base_var_files separator

In the opal list parsing behavior paths should be separated by ':' while files are separated by ','. In the opal and pmix code (the pmix fix is in a separate commit) there was a mistake in the parsing such that files were being separated by ':' when they should be separated by ','s. This commit attempts to address this mismatch.

Signed-off-by: Noah Evans <noah.evans@gmail.com>
Этот коммит содержится в:
Noah Evans 2017-10-11 13:02:10 -06:00 коммит произвёл Nathan Hjelm
родитель e59f58a57d
Коммит a64abadf97

Просмотреть файл

@ -411,7 +411,7 @@ int mca_base_var_cache_files(bool rel_path_search)
#if OPAL_WANT_HOME_CONFIG_FILES
asprintf(&mca_base_var_files, "%s"OPAL_PATH_SEP".openmpi" OPAL_PATH_SEP
"mca-params.conf%c%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
home, OPAL_ENV_SEP, opal_install_dirs.sysconfdir);
home, ',', opal_install_dirs.sysconfdir);
#else
asprintf(&mca_base_var_files, "%s" OPAL_PATH_SEP "openmpi-mca-params.conf",
opal_install_dirs.sysconfdir);
@ -527,7 +527,7 @@ int mca_base_var_cache_files(bool rel_path_search)
if (NULL != mca_base_var_file_prefix) {
resolve_relative_paths(&mca_base_var_file_prefix, mca_base_param_file_path, rel_path_search, &mca_base_var_files, OPAL_ENV_SEP);
}
read_files (mca_base_var_files, &mca_base_var_file_values, OPAL_ENV_SEP);
read_files (mca_base_var_files, &mca_base_var_file_values, ',');
if (NULL != mca_base_envar_file_prefix) {
resolve_relative_paths(&mca_base_envar_file_prefix, mca_base_param_file_path, rel_path_search, &mca_base_envar_files, ',');