Okay, Jeff - just for you...flow the show help thru the orte functions so help messages will be aggregated

This commit was SVN r28007.

ompi/mca/rte/orte/rte_orte_module.c

@@ -81,14 +81,14 @@ int ompi_show_help(const char *filename, const char *topic,
 {
     va_list arglist;
     char *output;
-    
+    int rc;
+
     if (orte_execute_quiet) {
-        return ORTE_SUCCESS;
+        return OMPI_SUCCESS;
     }
     
     va_start(arglist, want_error_header);
-    output = opal_show_help_vstring(filename, topic, want_error_header, 
-                                    arglist);
+    output = opal_show_help_vstring(filename, topic, want_error_header, arglist);
     va_end(arglist);
     
     /* If nothing came back, there's nothing to do */
@@ -96,8 +96,9 @@ int ompi_show_help(const char *filename, const char *topic,
         return OMPI_SUCCESS;
     }
     
-    opal_output(0, "%s", output);
-    return OMPI_SUCCESS;
+    rc = orte_show_help_norender(filename, topic, want_error_header, output);
+    free(output);
+    return rc;
 }
 
 

orte/util/show_help.c

@@ -714,6 +714,8 @@ int orte_show_help_norender(const char *filename, const char *topic,
             /* send it to the HNP */
             if (0 > (rc = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buf, ORTE_RML_TAG_SHOW_HELP, 0))) {
                 ORTE_ERROR_LOG(rc);
+            } else {
+                rc = ORTE_SUCCESS;
             }
             OBJ_DESTRUCT(&buf);
             am_inside = false;