Fix a problem reported by IBM: nolocal and bynode combined to map byslot. Problem actually was that any time multiple mapping policy directives were provided, we would only map byslot due to incorrect if statement conditions.

Thanks to Kris Davis for his patience while we tracked this down!

This commit was SVN r19039.

orte/mca/rmaps/round_robin/rmaps_rr.c

@@ -464,10 +464,10 @@ static int orte_rmaps_rr_map(orte_job_t *jdata)
         jdata->num_procs += app->num_procs;
 
         /* Make assignments */
-        if (map->policy == ORTE_RMAPS_BYUSER) {
+        if (map->policy & ORTE_RMAPS_BYUSER) {
             rc = ORTE_ERR_NOT_IMPLEMENTED;
             goto error;
-        } else if (map->policy == ORTE_RMAPS_BYNODE) {
+        } else if (map->policy & ORTE_RMAPS_BYNODE) {
             rc = map_app_by_node(app, jdata, vpid_start, &node_list);
         } else {
             rc = map_app_by_slot(app, jdata, vpid_start, &node_list);