Force use of pmix/preg/native component

Signed-off-by: Ralph Castain <[email protected]>

Author: rhc54

opal/mca/pmix/pmix4x/pmix/src/mca/preg/compress/preg_compress.c

@@ -76,12 +76,10 @@ static pmix_status_t generate_node_regex(const char *input,
     uint8_t *tmp;
 
     if (!pmix_compress.compress_string((char*)input, &tmp, &len)) {
-        PMIX_ERROR_LOG(PMIX_ERR_TAKE_NEXT_OPTION);
         return PMIX_ERR_TAKE_NEXT_OPTION;
     }
 
     if (NULL == tmp) {
-        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
         return PMIX_ERR_NOMEM;
     }
 
@@ -112,12 +110,10 @@ static pmix_status_t generate_ppn(const char *input,
     uint8_t *tmp;
 
     if (!pmix_compress.compress_string((char*)input, &tmp, &len)) {
-        PMIX_ERROR_LOG(PMIX_ERR_TAKE_NEXT_OPTION);
         return PMIX_ERR_TAKE_NEXT_OPTION;
     }
 
     if (NULL == tmp) {
-        PMIX_ERROR_LOG(PMIX_ERR_NOMEM);
         return PMIX_ERR_NOMEM;
     }
 

opal/mca/pmix/pmix4x/pmix/src/mca/preg/native/preg_native.c

@@ -457,7 +457,6 @@ static pmix_status_t parse_nodes(const char *regexp,
     /* the regex generator used to create this regex
      * is tagged at the beginning of the string */
     if (NULL == (ptr = strchr(tmp, '['))) {
-        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
         free(tmp);
         return PMIX_ERR_BAD_PARAM;
     }
@@ -499,7 +498,6 @@ static pmix_status_t parse_procs(const char *regexp,
     /* the regex generator used to create this regex
      * is tagged at the beginning of the string */
     if (NULL == (ptr = strchr(tmp, '['))) {
-        PMIX_ERROR_LOG(PMIX_ERR_BAD_PARAM);
         free(tmp);
         return PMIX_ERR_BAD_PARAM;
     }

opal/mca/pmix/pmix4x/pmix4x_component.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 Intel, Inc. All rights reserved.
+ * Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
  * Copyright (c) 2014-2018 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016-2018 Cisco Systems, Inc.  All rights reserved
@@ -20,6 +20,7 @@
 
 #include "opal/constants.h"
 #include "opal/class/opal_list.h"
+#include "opal/util/opal_environ.h"
 #include "opal/util/proc.h"
 #include "opal/util/show_help.h"
 #include "opal/mca/pmix/pmix.h"
@@ -126,6 +127,8 @@ static int external_open(void)
                        "incorrect-pmix", true, version, "v4.x");
         return OPAL_ERROR;
     }
+    /* we are going to be used, so set an envar */
+    opal_setenv("PMIX_MCA_preg", "native", true, &environ);
     return OPAL_SUCCESS;
 }