pmix: fix PMIx envar name for the installation prefix.

artpol84 · artpol84 · commit a4e5dc466785 · 2017-08-02T07:46:02.000+03:00
Signed-off-by: Artem Polyakov &lt;artpol84@gmail.com&gt;
diff --git a/opal/mca/pmix/pmix2x/pmix2x_client.c b/opal/mca/pmix/pmix2x/pmix2x_client.c
@@ -78,8 +78,9 @@ int pmix2x_client_init(opal_list_t *ilist)
             asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);
             putenv(dbgvalue);
         }
-        if (NULL != (evar = getenv("OPAL_PREFIX"))) {
-            opal_setenv("PMIX_PREFIX", evar, false, &environ);
+        if ((NULL != (evar = getenv("OPAL_PREFIX"))) && 
+            (NULL == getenv("PMIX_INSTALL_PREFIX"))) {
+            opal_setenv("PMIX_INSTALL_PREFIX", evar, false, &environ);
         }
     }
 
diff --git a/opal/mca/pmix/pmix2x/pmix2x_server_south.c b/opal/mca/pmix/pmix2x/pmix2x_server_south.c
@@ -109,8 +109,9 @@ int pmix2x_server_init(opal_pmix_server_module_t *module,
             asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);
             putenv(dbgvalue);
         }
-        if (NULL != (evar = getenv("OPAL_PREFIX"))) {
-            opal_setenv("PMIX_PREFIX", evar, false, &environ);
+        if ((NULL != (evar = getenv("OPAL_PREFIX"))) && 
+            (NULL == getenv("PMIX_INSTALL_PREFIX"))) {
+            opal_setenv("PMIX_INSTALL_PREFIX", evar, false, &environ);
         }
     }
     ++opal_pmix_base.initialized;

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,9 @@ int pmix2x_client_init(opal_list_t *ilist)`
`78`	`78`	`asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);`
`79`	`79`	`putenv(dbgvalue);`
`80`	`80`	`}`
`81`		`- if (NULL != (evar = getenv("OPAL_PREFIX"))) {`
`82`		`- opal_setenv("PMIX_PREFIX", evar, false, &environ);`
	`81`	`+ if ((NULL != (evar = getenv("OPAL_PREFIX"))) &&`
	`82`	`+ (NULL == getenv("PMIX_INSTALL_PREFIX"))) {`
	`83`	`+ opal_setenv("PMIX_INSTALL_PREFIX", evar, false, &environ);`
`83`	`84`	`}`
`84`	`85`	`}`
`85`	`86`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,9 @@ int pmix2x_server_init(opal_pmix_server_module_t *module,`
`109`	`109`	`asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);`
`110`	`110`	`putenv(dbgvalue);`
`111`	`111`	`}`
`112`		`- if (NULL != (evar = getenv("OPAL_PREFIX"))) {`
`113`		`- opal_setenv("PMIX_PREFIX", evar, false, &environ);`
	`112`	`+ if ((NULL != (evar = getenv("OPAL_PREFIX"))) &&`
	`113`	`+ (NULL == getenv("PMIX_INSTALL_PREFIX"))) {`
	`114`	`+ opal_setenv("PMIX_INSTALL_PREFIX", evar, false, &environ);`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`	`++opal_pmix_base.initialized;`