From 52e871dbc7bf5b61003718cd3342b5ce5d882c6a Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Fri, 20 Jan 2017 20:47:09 +0000
Subject: [PATCH] Fix in trisurf.py in getLastVTU not returning the result if directory does not exist or is empty.
---
trisurf/Remote.py | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 deletions(-)
diff --git a/trisurf/Remote.py b/trisurf/Remote.py
index 977b96a..2bf80f1 100644
--- a/trisurf/Remote.py
+++ b/trisurf/Remote.py
@@ -20,23 +20,20 @@
def connect(self, Timeout=5):
if(not self.connected):
- try:
- print("Trying to connect to: "+self.username+"@"+self.hostname+":"+str(self.port)+".")
- self.ssh.connect(self.hostname, username=self.username, password=self.password, port=self.port, timeout=Timeout)
- self.connected=True
- except:
- print("Error establishing connection with "+self.username+"@"+self.hostname+":"+str(self.port)+".")
- exit(1)
+# try:
+ print("Trying to connect to: "+self.username+"@"+self.hostname+":"+str(self.port)+".")
+ self.ssh.connect(self.hostname, username=self.username, password=self.password, port=self.port, timeout=Timeout)
+ self.connected=True
+# except:
+# print("Error establishing connection with "+self.username+"@"+self.hostname+":"+str(self.port)+".")
+# exit(1)
else:
print("Already connected!")
return
def disconnect(self):
if(self.connected):
- try:
- self.ssh.close()
- except:
- print("Cannot disconect. Unknown error.")
+ self.ssh.close()
else:
print("Cannot disconect. Already disconnected.")
self.connected=False
@@ -55,14 +52,16 @@
print("Cannot execute remote commands. Connect first.")
def send_file(self, local, remote):
- sftp=self.ssh.open_sftp()
- sftp.put(local,remote)
- sftp.close()
+ pass
+# sftp=self.ssh.open_sftp()
+# sftp.put(local,remote)
+# sftp.close()
def receive_file(self,remote,local):
- sftp=self.ssh.open_sftp()
- sftp.get(remote,local)
- sftp.close()
+ pass
+# sftp=self.ssh.open_sftp()
+# sftp.get(remote,local)
+# sftp.close()
def mkdir_remote(self,directory):
sftp=self.ssh.open_sftp()
@@ -89,13 +88,4 @@
return True
def send_multiple_files_in_directory(self,local_files,directory):
- sftp=self.ssh.open_sftp()
-# try:
-# sftp.chdir(directory) # Test if remote_path exists
-# except (IOError,FileNotFoundError):
-# sftp.mkdir(directory) # Create remote_path
-# sftp.chdir(directory)
- self.mkdir_p(sftp, directory)
- for f in set(local_files):
- sftp.put(f, f)
- sftp.close()
+ pass
--
Gitblit v1.9.3