sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.transceivers] EntropySshUriHandler: download/upload functions are now atomic

Browse Source
This commit is contained in:
Fabio Erculiani
2010-01-04 14:08:35 +01:00
parent 191ad0910e
commit 3b87f4ff01
1 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libraries/entropy/transceivers/uri_handlers/plugins/interfaces/ssh_plugin.py
View File

@@ -210,18 +210,39 @@ class EntropySshUriHandler(EntropyUriHandler):
return args, remote_str
def download(self, remote_path, save_path):
args = [EntropySshUriHandler._TXC_CMD]
c_args, remote_str = self._setup_common_args(remote_path)
tmp_save_path = save_path + EntropyUriHandler.TMP_TXC_FILE_EXT
args.extend(c_args)
args += ["-B", "-P", str(self.__port), remote_str, save_path]
return self._fork_cmd(args) == 0
args += ["-B", "-P", str(self.__port), remote_str, tmp_save_path]
down_sts = self._fork_cmd(args) == 0
if not down_sts:
try:
os.remove(tmp_save_path)
except OSError:
return False
return False
os.rename(tmp_save_path, save_path)
return True
def upload(self, load_path, remote_path):
args = [EntropySshUriHandler._TXC_CMD]
c_args, remote_str = self._setup_common_args(remote_path)
tmp_remote_path = remote_path + EntropyUriHandler.TMP_TXC_FILE_EXT
c_args, remote_str = self._setup_common_args(tmp_remote_path)
args.extend(c_args)
args += ["-B", "-P", str(self.__port), load_path, remote_str]
return self._fork_cmd(args) == 0
upload_sts = self._fork_cmd(args) == 0
if not upload_sts:
self.delete(tmp_remote_path)
return False
# atomic rename
return self.rename(tmp_remote_path, remote_path)
def _setup_fs_args(self):
args = [EntropySshUriHandler._SSH_CMD]