[mpich2-commits] r7886 - mpich2/trunk/src/pm/hydra/tools/bootstrap/external

[balaji at mcs.anl.gov]

Author: balaji
Date: 2011-02-01 18:37:57 -0600 (Tue, 01 Feb 2011)
New Revision: 7886

Modified:
   mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_env.c
Log:
Bug-fix: we were incorrectly checking for RMK instead of the launcher.

Modified: mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_env.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_env.c	2011-02-01 21:42:50 UTC (rev 7885)
+++ mpich2/trunk/src/pm/hydra/tools/bootstrap/external/external_env.c	2011-02-02 00:37:57 UTC (rev 7886)
@@ -17,7 +17,7 @@
 
     *ret = 1;
 
-    if (!strcmp(HYDT_bsci_info.rmk, "ssh")) {
+    if (!strcmp(HYDT_bsci_info.launcher, "ssh")) {
         const char *env_list[] = { "DISPLAY", NULL };
 
         for (i = 0; env_list[i]; i++) {
@@ -28,7 +28,7 @@
         }
     }
 
-    if (!strcmp(HYDT_bsci_info.rmk, "lsf")) {
+    if (!strcmp(HYDT_bsci_info.launcher, "lsf")) {
         const char *env_list[] = { "DISPLAY", "EGO_SERVERDIR", "LSB_TRAPSIGS",
             "LSF_SERVERDIR", "HOSTTYPE", "LSB_HOSTS",
             "LSF_BINDIR", "EGO_BINDIR", "PWD", "HOME",
@@ -56,7 +56,7 @@
         }
     }
 
-    if (!strcmp(HYDT_bsci_info.rmk, "sge")) {
+    if (!strcmp(HYDT_bsci_info.launcher, "sge")) {
         const char *env_list[] = { "DISPLAY", "SGE_ROOT", "SGE_CELL", "SGE_DEBUG_LEVEL",
             "SGE_QMASTER_PORT", "SGE_O_HOME", "SGE_O_HOST",
             "SGE_O_LOGNAME", "SGE_O_MAIL", "SGE_O_PATH",
@@ -80,7 +80,7 @@
         }
     }
 
-    if (!strcmp(HYDT_bsci_info.rmk, "slurm")) {
+    if (!strcmp(HYDT_bsci_info.launcher, "slurm")) {
         const char *env_list[] = { "SLURM_ACCOUNT", "SLURM_CPU_BIND",
             "SLURM_CPUS_PER_TASK", "SLURM_CONN_TYPE",
             "SLURM_CORE_FORMAT", "SLURM_DEBUG", "SLURMD_DEBUG",
@@ -110,7 +110,7 @@
         }
     }
 
-    if (!strcmp(HYDT_bsci_info.rmk, "ll")) {
+    if (!strcmp(HYDT_bsci_info.launcher, "ll")) {
         const char *env_list[] = { "LOADL_STEP_CLASS", "LOADL_STEP_ARGS",
             "LOADL_STEP_ID", "LOADL_STARTD_PORT",
             "LOADL_STEP_NICE", "LOADL_STEP_IN", "LOADL_STEP_ERR",