Very tiny modification of the output when displaying mca param values to clarify that ones found in the environment could have also been set on the cmd line - we don't have a way to distinguish them internally.

This commit was SVN r19636.

ompi/runtime/ompi_mpi_params.c

@@ -398,7 +398,7 @@ int ompi_show_all_mca_params(int32_t rank, int requested, char *nodename) {
                 src_string = "default value";
                 break;
             case MCA_BASE_PARAM_SOURCE_ENV:
-                src_string = "environment";
+                src_string = "environment or cmdline";
                 break;
             case MCA_BASE_PARAM_SOURCE_FILE:
                 src_string = "file";

ompi/tools/ompi_info/param.cc

@@ -220,7 +220,7 @@ void ompi_info::show_mca_params(opal_list_t *info,
                         content += "default value";
                         break;
                     case MCA_BASE_PARAM_SOURCE_ENV:
-                        content += "environment";
+                        content += "environment or cmdline";
                         break;
                     case MCA_BASE_PARAM_SOURCE_FILE:
                         content += "file [";
@@ -296,7 +296,7 @@ void ompi_info::show_mca_params(opal_list_t *info,
                         content = "default value";
                         break;
                     case MCA_BASE_PARAM_SOURCE_ENV:
-                        content = "environment";
+                        content = "environment-cmdline";
                         break;
                     case MCA_BASE_PARAM_SOURCE_FILE:
                         content = "file:";