##@$%#@$%!!! I thought we got all of these -- thanks Gleb...
> -----Original Message----- > From: svn-full-boun...@open-mpi.org > [mailto:svn-full-boun...@open-mpi.org] On Behalf Of g...@osl.iu.edu > Sent: Thursday, May 11, 2006 9:16 AM > To: svn-f...@open-mpi.org > Subject: [OMPI svn-full] svn:open-mpi r9892 > > Author: gleb > Date: 2006-05-11 09:15:48 EDT (Thu, 11 May 2006) > New Revision: 9892 > > Modified: > trunk/orte/mca/pls/fork/pls_fork_module.c > trunk/orte/mca/pls/slurm/pls_slurm_module.c > trunk/orte/mca/pls/tm/pls_tm_module.c > > Log: > remove newline from environment > > > Modified: trunk/orte/mca/pls/fork/pls_fork_module.c > ============================================================== > ================ > --- trunk/orte/mca/pls/fork/pls_fork_module.c (original) > +++ trunk/orte/mca/pls/fork/pls_fork_module.c 2006-05-11 > 09:15:48 EDT (Thu, 11 May 2006) > @@ -324,7 +324,7 @@ > > /* 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 @@ > > /* 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); > > Modified: trunk/orte/mca/pls/slurm/pls_slurm_module.c > ============================================================== > ================ > --- trunk/orte/mca/pls/slurm/pls_slurm_module.c (original) > +++ trunk/orte/mca/pls/slurm/pls_slurm_module.c > 2006-05-11 09:15:48 EDT (Thu, 11 May 2006) > @@ -471,7 +471,7 @@ > /* 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 @@ > /* 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); > } > > Modified: trunk/orte/mca/pls/tm/pls_tm_module.c > ============================================================== > ================ > --- trunk/orte/mca/pls/tm/pls_tm_module.c (original) > +++ trunk/orte/mca/pls/tm/pls_tm_module.c 2006-05-11 > 09:15:48 EDT (Thu, 11 May 2006) > @@ -311,7 +311,7 @@ > 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 @@ > > /* 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", > _______________________________________________ > svn-full mailing list > svn-f...@open-mpi.org > http://www.open-mpi.org/mailman/listinfo.cgi/svn-full >
