Switch precedence - take the --prefix value over the absolute-path-to-mpirun so the backend prefix can be different from that of mpirun on hetero machines.

This commit was SVN r26085.

orte/tools/orterun/help-orterun.txt

@@ -159,7 +159,8 @@ given:
 
 Only one should be specified to avoid potential version
 confusion. Operation will continue, but the -prefix option will be
-ignored.
+used. This is done to allow you to select a different prefix for
+the backend computation nodes than used on the frontend for %s.
 #
 [orterun:app-prefix-conflict]
 Both a prefix or absolute path was given for %s, and a different

orte/tools/orterun/orterun.c

@@ -605,13 +605,14 @@ int orterun(int argc, char *argv[])
             param = strdup(opal_cmd_line_get_param(&cmd_line, "prefix", 0, 0));
             if (0 != strcmp(param, orterun_globals.path_to_mpirun)) {
                 orte_show_help("help-orterun.txt", "orterun:double-prefix",
-                               true, orte_basename,
+                               true, orte_basename, param,
-                               param, orterun_globals.path_to_mpirun);
+                               orterun_globals.path_to_mpirun, orte_basename);
-                /* let the path-to-mpirun take precedence since we
+                /* use the prefix over the path-to-mpirun so that
-                 * know that one is being  used
+                 * people can specify the backend prefix as different
+                 * from the local one
                  */
-                free(param);
+                free(orterun_globals.path_to_mpirun);
-                param = orterun_globals.path_to_mpirun;
+                orterun_globals.path_to_mpirun = NULL;
             } else {
                 /* since they match, just use param */
                 free(orterun_globals.path_to_mpirun);
@@ -1885,7 +1886,6 @@ static int create_app(int argc, char* argv[],
     }
     if (orterun_globals.verbose) {
         value = opal_argv_join(app->argv, ' ');
-        opal_output(0, "DONE PARSING APP: %s", value);
         free(value);
     }