Allow the ALPS allocator to run if the BASIL_RESERVATION_ID has been set. Update show_help messages and comments to reflect this new scenario.

Thanks to Jerome Soumagne for the patch!

This commit was SVN r23374.

orte/mca/ras/alps/help-ras-alps.txt

@@ -20,18 +20,19 @@
 #
 [alps-env-var-not-found]
 While trying to determine what resources are available, the ALPS
-resource allocator expects to find the following environment variables:
+resource allocator expects to find one of the following environment
+variables:
 
 	 OMPI_ALPS_RESID
+	 BASIL_RESERVATION_ID
     
-However, it was unable to find the following environment variable:
-
-    %s
+However, it was unable to find either one of these variables.
 
 #This is a fatal error.
 [alps-env-var-invalid]
 While trying to determine what resources are available, the ALPS
-resource allocator uses the OMPI_ALPS_RESID environment variable.
+resource allocator uses either the OMPI_ALPS_RESID or the
+BASIL_RESERVATION_ID environment variable.
 
 However, an error was encountered when trying to parse the variable:
 

orte/mca/ras/alps/ras_alps_component.c

@@ -93,7 +93,7 @@ static int orte_ras_alps_component_query(mca_base_module_t **module, int *priori
     
     /* Are we running under a ALPS job? */
 
-    if (NULL != getenv("OMPI_ALPS_RESID")) {
+    if ((NULL != getenv("OMPI_ALPS_RESID")) || (NULL != getenv("BASIL_RESERVATION_ID"))) {
         mca_base_param_lookup_int(param_priority, priority);
         opal_output_verbose(1, orte_ras_base.ras_output,
                              "ras:alps: available for selection");
@@ -104,7 +104,7 @@ static int orte_ras_alps_component_query(mca_base_module_t **module, int *priori
     /* Sadly, no */
 
     opal_output(orte_ras_base.ras_output,
-                "ras:alps: NOT available for selection -- OMPI_ALPS_RESID not set?");
+                "ras:alps: NOT available for selection -- OMPI_ALPS_RESID or BASIL_RESERVATION_ID not set?");
     *module = NULL;
     return ORTE_ERROR;
 }

orte/mca/ras/alps/ras_alps_module.c

@@ -70,9 +70,12 @@ static int orte_ras_alps_allocate(opal_list_t *nodes)
     char        *alps_config_str;
     
     alps_batch_id = getenv("OMPI_ALPS_RESID");
+    /* BASIL_RESERVATION_ID is the equivalent of OMPI_ALPS_RESID
+     * on some systems
+     */
+    if (NULL == alps_batch_id) alps_batch_id = getenv("BASIL_RESERVATION_ID");
     if (NULL == alps_batch_id) {
-        orte_show_help("help-ras-alps.txt", "alps-env-var-not-found", 1,
-                       "OMPI_ALPS_RESID");
+        orte_show_help("help-ras-alps.txt", "alps-env-var-not-found", 1);
         return ORTE_ERR_NOT_FOUND;
     }