Cleanup error message if unknown host is given in -host and -hostfile options

This commit was SVN r28262.

orte/mca/rmaps/base/help-orte-rmaps-base.txt

@@ -38,13 +38,13 @@ The requested hosts were:
 Verify that you have mapped the allocated resources properly using the 
 --host or --hostfile specification.
 [orte-rmaps-base:no-mapped-node]
-There are no allocated resources for the application 
+There are no allocated resources for the application: 
   %s
 that match the requested mapping:
-  %s
+  %s: %s
 
-Verify that you have mapped the allocated resources properly using the 
---host or --hostfile specification.
+Verify that you have mapped the allocated resources properly for the 
+indicated specification.
 [orte-rmaps-base:nolocal-no-available-resources]
 There are no available nodes allocated to this job. This could be because
 no nodes were found or all the available nodes were already used.

orte/mca/rmaps/base/rmaps_base_support_fns.c

@@ -65,7 +65,7 @@ int orte_rmaps_base_filter_nodes(orte_app_context_t *app,
         /** check that anything is here */
         if (0 == opal_list_get_size(nodes)) {
             orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-mapped-node",
-                           true, app->app, app->hostfile);
+                           true, app->app, "-hostfile", app->hostfile);
             return ORTE_ERR_SILENT;
         }
     }
@@ -81,7 +81,7 @@ int orte_rmaps_base_filter_nodes(orte_app_context_t *app,
         /** check that anything is here */
         if (0 == opal_list_get_size(nodes)) {
             orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-mapped-node",
-                           true, app->app, app->hostfile);
+                           true, app->app, "-add-hostfile", app->hostfile);
             return ORTE_ERR_SILENT;
         }
     }
@@ -93,8 +93,11 @@ int orte_rmaps_base_filter_nodes(orte_app_context_t *app,
         }
         /** check that anything is left! */
         if (0 == opal_list_get_size(nodes)) {
+            char *foo;
+            foo = opal_argv_join(app->dash_host, ',');
             orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-mapped-node",
-                           true, app->app, "");
+                           true, app->app, "-host", foo);
+            free(foo);
             return ORTE_ERR_SILENT;
         }
     }
@@ -106,8 +109,11 @@ int orte_rmaps_base_filter_nodes(orte_app_context_t *app,
         }
         /** check that anything is left! */
         if (0 == opal_list_get_size(nodes)) {
+            char *foo;
+            foo = opal_argv_join(app->dash_host, ',');
             orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-mapped-node",
-                           true, app->app, "");
+                           true, app->app, "-add-host", foo);
+            free(foo);
             return ORTE_ERR_SILENT;
         }
     }