[Swift-commit] cog r3906

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3906 | hategan | 2014-05-18 19:12:07 -0500 (Sun, 18 May 2014) | 1 line

fix for bug #1197 (port from 4.1.10)
------------------------------------------------------------------------
Index: modules/provider-ssh/src/org/globus/cog/abstraction/impl/sshcl/execution/JobSubmissionTaskHandler.java
===================================================================
--- modules/provider-ssh/src/org/globus/cog/abstraction/impl/sshcl/execution/JobSubmissionTaskHandler.java	(revision 3905)
+++ modules/provider-ssh/src/org/globus/cog/abstraction/impl/sshcl/execution/JobSubmissionTaskHandler.java	(working copy)
@@ -90,6 +90,9 @@
          */
         cmdarray.add("-s");
         
+        if (logger.isInfoEnabled()) {
+            logger.info("SSH-CL cmd-array: " + new ArrayList<String>(cmdarray));
+        }
         return cmdarray;
     }
     
@@ -119,6 +122,17 @@
             ps.println(escape(spec.getEnvironmentVariable(env)));
         }
         
+        /**
+         * Fix for bug #1197 which is really just some messed up logic
+         * in a particular piece of software that does what it shouldn't do
+         * in a profile script.
+         * 
+         * This fix is in the wrong place, in the sense that, if anything,
+         * it should be in the coaster code. Unfortunately there's no
+         * nice place to fit it in the coaster code.
+         */
+        ps.println("export SHLVL=1");
+        
         ps.print(escape(spec.getExecutable()));
         for (String arg : spec.getArgumentsAsList()) {
             ps.print(" ");
@@ -129,7 +143,7 @@
         ps.flush();
         super.processIN(in, dir, os);
     }
-    
+        
     /*
      * Escape everything that bash cares about (I hope this is everything)
      */