Merge branch 'new_cluster' of github.com:SSCHAcode/python-sscha into new_cluster

Author: mesonepigreco

Modules/Cluster.py

@@ -326,8 +326,12 @@ def ExecuteCMD(self, cmd, raise_error = True, return_output = False, on_cluster
             if not isinstance(output, str):
                 try:
                     output = str(output.decode("utf-8"))
-                except:
-                    pass
+                except Exception as e:
+                    sys.stderr.write("Error in the following command:\n")
+                    sys.stderr.write(e)
+                    sys.stderr.write("\n")
+                    sys.stderr.flush()
+                    
             output = output.strip()
             status = p.wait()
             if not err is None:
@@ -763,8 +767,12 @@ def batch_submission(self, list_of_structures, calc, indices,
             # Get the results
             try:
                 results[i] = self.read_results(calc, lbl) 
-            except:
-                pass
+            except Exception as e:
+                sys.stderr.write("JOB {} | {} resulted in error:\n".format(i, lbl))
+                sys.stderr.write(e)
+                sys.stderr.write("\n")
+                sys.stderr.flush()
+                
 
         return results
 
@@ -1202,7 +1210,15 @@ def parse_string(self, string):
         # Open a pipe with the server
         # Use single ' to avoid string parsing by the local terminal
         cmd = "%s %s 'echo \"%s\"'" % (self.sshcmd, self.hostname, string)
+
+        if self.use_active_shell:
+            cmd = "{ssh} {host} -t '{shell} --login -c \"echo {string}\"'".format(ssh = self.sshcmd, 
+                         host = self.hostname, 
+                         string = string.replace("$", "\$"), 
+                         shell = self.terminal)
         #print cmd
+
+        #print(cmd)
 
         status, output = self.ExecuteCMD(cmd, return_output = True)
 #