remove newline from environment
This commit was SVN r9892.
Этот коммит содержится в:
родитель
3d76bd83cb
Коммит
80dfe7e39b
@ -324,7 +324,7 @@ static int orte_pls_fork_proc(
|
||||
|
||||
/* Reset PATH */
|
||||
if (0 == strncmp("PATH=", context->env[i], 5)) {
|
||||
asprintf(&newenv, "%s/bin:%s\n",
|
||||
asprintf(&newenv, "%s/bin:%s",
|
||||
context->prefix_dir, context->env[i] + 5);
|
||||
opal_setenv("PATH", newenv, true, &environ_copy);
|
||||
free(newenv);
|
||||
@ -332,7 +332,7 @@ static int orte_pls_fork_proc(
|
||||
|
||||
/* Reset LD_LIBRARY_PATH */
|
||||
else if (0 == strncmp("LD_LIBRARY_PATH=", context->env[i], 16)) {
|
||||
asprintf(&newenv, "%s/lib:%s\n",
|
||||
asprintf(&newenv, "%s/lib:%s",
|
||||
context->prefix_dir, context->env[i] + 16);
|
||||
opal_setenv("LD_LIBRARY_PATH", newenv, true, &environ_copy);
|
||||
free(newenv);
|
||||
|
@ -471,7 +471,7 @@ static int pls_slurm_start_proc(int argc, char **argv, char **env,
|
||||
/* Reset PATH */
|
||||
oldenv = getenv("PATH");
|
||||
if (NULL != oldenv) {
|
||||
asprintf(&newenv, "%s/bin:%s\n", prefix, oldenv);
|
||||
asprintf(&newenv, "%s/bin:%s", prefix, oldenv);
|
||||
} else {
|
||||
asprintf(&newenv, "%s/bin", prefix);
|
||||
}
|
||||
@ -484,7 +484,7 @@ static int pls_slurm_start_proc(int argc, char **argv, char **env,
|
||||
/* Reset LD_LIBRARY_PATH */
|
||||
oldenv = getenv("LD_LIBRARY_PATH");
|
||||
if (NULL != oldenv) {
|
||||
asprintf(&newenv, "%s/lib:%s\n", prefix, oldenv);
|
||||
asprintf(&newenv, "%s/lib:%s", prefix, oldenv);
|
||||
} else {
|
||||
asprintf(&newenv, "%s/lib", prefix);
|
||||
}
|
||||
|
@ -311,7 +311,7 @@ pls_tm_launch(orte_jobid_t jobid)
|
||||
for (i = 0; NULL != env && NULL != env[i]; ++i) {
|
||||
/* Reset PATH */
|
||||
if (0 == strncmp("PATH=", env[i], 5)) {
|
||||
asprintf(&newenv, "%s/bin:%s\n",
|
||||
asprintf(&newenv, "%s/bin:%s",
|
||||
cur_prefix, env[i] + 5);
|
||||
if (mca_pls_tm_component.debug) {
|
||||
opal_output(0, "pls:tm: resetting PATH: %s",
|
||||
@ -323,7 +323,7 @@ pls_tm_launch(orte_jobid_t jobid)
|
||||
|
||||
/* Reset LD_LIBRARY_PATH */
|
||||
else if (0 == strncmp("LD_LIBRARY_PATH=", env[i], 16)) {
|
||||
asprintf(&newenv, "%s/lib:%s\n",
|
||||
asprintf(&newenv, "%s/lib:%s",
|
||||
cur_prefix, env[i] + 16);
|
||||
if (mca_pls_tm_component.debug) {
|
||||
opal_output(0, "pls:tm: resetting LD_LIBRARY_PATH: %s",
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user