Let VM-based mappings include the updated nidmap

This commit was SVN r23596.

orte/mca/odls/base/odls_base_default_fns.c

@@ -118,11 +118,6 @@ int orte_odls_base_default_get_add_procs_data(opal_buffer_t *data,
         return ORTE_SUCCESS;
     }
     
-    /* if the mapping policy is to use a vm, skip to the add_procs part */
-    if (ORTE_MAPPING_USE_VM & map->policy) {
-        goto pack_add_procs;
-    }
-    
     /* are we passing a regexp? */
     if (orte_use_regexp && jdata->num_apps < 2 && NULL == orte_debugger_daemon) {
         char *regexp;
@@ -199,7 +194,7 @@ int orte_odls_base_default_get_add_procs_data(opal_buffer_t *data,
         return ORTE_SUCCESS;
     }
     
-nodemap:
+ nodemap:
     /* if we are not passing a regexp, then pass the nodemap */
     flag = 0;
     opal_dss.pack(data, &flag, 1, OPAL_INT8);
@@ -265,7 +260,6 @@ nodemap:
         opal_dss.pack(data, &flag, 1, OPAL_INT8);
     }
 
-pack_add_procs:
     /* insert an "add-procs" command here so we can cleanly process it on the
      * other end
      */