From e33ab49941dd3904e83a31788d7b5c5d1aa2aedf Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 26 Jul 2016 20:27:36 +0000
Subject: [PATCH] another attempt fix for occasional 'no such file' errors
---
src/python/dm/common/utility/sftpUtility.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/python/dm/common/utility/sftpUtility.py b/src/python/dm/common/utility/sftpUtility.py
index f9f384e2..3a4829ca 100755
--- a/src/python/dm/common/utility/sftpUtility.py
+++ b/src/python/dm/common/utility/sftpUtility.py
@@ -92,8 +92,8 @@ class SftpUtility:
self.sftpClient = self.getSftpClient(self.host, self.port, self.username, self.password, self.privateKey)
try:
#md5Sum = self.sftpClient.execute('md5sum "%s"' % filePath)[0].split()[0]
- output = self.sftpClient.execute('md5sum "%s"' % filePath)[0]
- if output.startswith("md5sum"):
+ output = self.sftpClient.execute('md5sum "%s"' % filePath)[0].strip()
+ if not output.endswith(filePath):
raise CommandFailed(output)
md5Sum = output.split()[0]
fileInfo['md5Sum'] = md5Sum
@@ -147,7 +147,8 @@ if __name__ == '__main__':
sftpUtility = SftpUtility('s1dserv',privateKey='/home/beams/DMADMIN/.ssh/id_dsa')
#files = sftpUtility.getFiles('/export/dm/test')
#print files
- print sftpUtility.getMd5Sum('/export/dm/test/testfile01')
+ print sftpUtility.getMd5Sum('/export/dm/test/testfile03(2nd).txt')
+ print sftpUtility.getMd5Sum('/export/dm/test/testfile 04.txt')
#print 'Closing connection'
#sftpUtility.closeConnection()
#print sftpUtility.statFile('/export/dm/test/testfile01')
--
GitLab