From 7facb3f3e93481d83c30adcda6d0af98096a91ed Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 13 Sep 2018 09:24:19 -0700 Subject: [PATCH] Pickup and deploy network-specific envars Signed-off-by: Ralph Castain --- opal/mca/pmix/pmix4x/pmix/src/mca/pnet/tcp/pnet_tcp.c | 2 +- orte/mca/odls/base/odls_base_default_fns.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/opal/mca/pmix/pmix4x/pmix/src/mca/pnet/tcp/pnet_tcp.c b/opal/mca/pmix/pmix4x/pmix/src/mca/pnet/tcp/pnet_tcp.c index aeb883a524..f74d13485d 100644 --- a/opal/mca/pmix/pmix4x/pmix/src/mca/pnet/tcp/pnet_tcp.c +++ b/opal/mca/pmix/pmix4x/pmix/src/mca/pnet/tcp/pnet_tcp.c @@ -342,7 +342,7 @@ static pmix_status_t allocate(pmix_nspace_t *nptr, return rc; } return PMIX_SUCCESS; - } else if (PMIX_CHECK_KEY(info, PMIX_ALLOC_NETWORK)) { + } else if (!PMIX_CHECK_KEY(info, PMIX_ALLOC_NETWORK)) { /* not a network allocation request */ return PMIX_SUCCESS; } diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c index 76faa19c6e..b2cf785712 100644 --- a/orte/mca/odls/base/odls_base_default_fns.c +++ b/orte/mca/odls/base/odls_base_default_fns.c @@ -684,6 +684,8 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *buffer, 0 == strcmp(kv->key, OPAL_PMIX_UNSET_ENVAR) || 0 == strcmp(kv->key, OPAL_PMIX_PREPEND_ENVAR) || 0 == strcmp(kv->key, OPAL_PMIX_APPEND_ENVAR)) { + opal_output_verbose(5, orte_odls_base_framework.framework_output, + "ORTE:ODLS ADDING ENVAR %s", kv->data.envar.envar); opal_list_prepend(&cache, &kv->super); } else { /* need to pass it to pmix.setup_local_support */