From a896f9071240d720dec3718555e642bc63887b87 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Fri, 22 Aug 2014 01:53:38 +0000
Subject: [PATCH] btl_base_select: fix faulty/incorrect show_help message

When no components were able to be found, btl_base_select() was
showing the wrong help message -- one that indicated that a specific
component could not be found.  And it left off a string argument, so
the end of the help message was garbage.

This commit creates a new help message for this case and updates the
show_help call to use the new message.

This commit was SVN r32572.
---
 opal/mca/base/help-mca-base.txt     | 11 +++++++++++
 opal/mca/btl/base/btl_base_select.c |  6 +++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/opal/mca/base/help-mca-base.txt b/opal/mca/base/help-mca-base.txt
index 95b9493f10..746904486f 100644
--- a/opal/mca/base/help-mca-base.txt
+++ b/opal/mca/base/help-mca-base.txt
@@ -30,6 +30,17 @@ Host:      %s
 Framework: %s
 Component: %s
 #
+[find-available:none found]
+No components were able to be opened in the %s framework.
+
+This typically means that either no components of this type were
+installed, or none of the installed componnets can be loaded.
+Sometimes this means that shared libraries required by these
+components are unable to be found/loaded.
+
+  Host:      %s
+  Framework: %s
+#
 [framework-param:too-many-negates]
 MCA framework parameters can only take a single negation operator
 ("^"), and it must be at the beginning of the value.  The following
diff --git a/opal/mca/btl/base/btl_base_select.c b/opal/mca/btl/base/btl_base_select.c
index ec67977038..8cdedbe308 100644
--- a/opal/mca/btl/base/btl_base_select.c
+++ b/opal/mca/btl/base/btl_base_select.c
@@ -15,6 +15,7 @@
  *                         All rights reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -154,7 +155,10 @@ int mca_btl_base_select(bool enable_progress_threads,
     /* Finished querying all components.  Check for the bozo case. */
 
     if (0 == opal_list_get_size(&mca_btl_base_modules_initialized)) {
-        opal_show_help("help-mca-base.txt", "find-available:not-valid", true,
+        opal_show_help("help-mca-base.txt", "find-available:none found",
+                       true,
+                       "btl",
+                       opal_process_info.nodename,
                        "btl");
         return OPAL_ERROR;
     }