Once again, bloody SLURM changes the envars and breaks things. Try and track their changes so we get a correct allocation.

This commit was SVN r27302.

orte/mca/ras/slurm/ras_slurm_module.c

@@ -88,6 +88,9 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes)
     }
     regexp = strdup(slurm_node_str);
     
+    tasks_per_node = getenv("SLURM_JOB_CPUS_PER_NODE");
+    if (NULL == tasks_per_node) {
+        /* try an older variation */
         tasks_per_node = getenv("SLURM_TASKS_PER_NODE");
         if (NULL == tasks_per_node) {
             /* couldn't find any version - abort */
@@ -95,6 +98,7 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes)
                            "SLURM_TASKS_PER_NODE");
             return ORTE_ERR_NOT_FOUND;
         }
+    }
     node_tasks = strdup(tasks_per_node);
 
     if(NULL == regexp || NULL == node_tasks) {