From 28d5f762ca5d60fafe8829fb19879c203e3c7c39 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 16 May 2008 02:03:42 +0000 Subject: [PATCH] Fixes trac:1289: ensure that if we haven't initialized the orte_output system, we don't try to use it (e.g., if orte_output or orte_show_help is called before orte_init). This commit was SVN r18442. The following Trac tickets were found above: Ticket 1289 --> https://svn.open-mpi.org/trac/ompi/ticket/1289 --- orte/util/output.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orte/util/output.c b/orte/util/output.c index 4e99a6b34e..f78696a4cb 100644 --- a/orte/util/output.c +++ b/orte/util/output.c @@ -523,7 +523,7 @@ static int show_help(const char *filename, const char *topic, /* If we're aggregating, check for duplicates. Otherwise, don't track duplicates at all and always display the message. */ - if (want_aggregate) { + if (orte_output_ready && want_aggregate) { rc = get_tli(filename, topic, &tli); } else { rc = ORTE_ERR_NOT_FOUND; @@ -580,7 +580,7 @@ static int show_help(const char *filename, const char *topic, } /* If we're aggregating, add this process name to the list */ - if (want_aggregate) { + if (orte_output_ready && want_aggregate) { pnli = OBJ_NEW(process_name_list_item_t); if (NULL == pnli) { rc = ORTE_ERR_OUT_OF_RESOURCE;