Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: remote_engine: support older paramiko ......................................................................
packaging: setup: remote_engine: support older paramiko Support el6's version of paramiko in which SFTPFile is not a context manager. Change-Id: I730d15670bd9aa5dc68d6d1f93157c5895429491 Bug-Url: https://bugzilla.redhat.com/1150498 Signed-off-by: Yedidyah Bar David <d...@redhat.com> (cherry picked from commit 9c29b4c4224927a079c0fab75502c52feaaa1e1d) --- M packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py 1 file changed, 15 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/34055/1 diff --git a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py index 373c381..ce3c127 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py @@ -67,12 +67,12 @@ def _ssh_get_port(self): port_valid = False - port = None + key = osetupcons.ConfigEnv.REMOTE_ENGINE_HOST_SSH_PORT + port = self.environment[key] interactive = False while not port_valid: try: - key = osetupcons.ConfigEnv.REMOTE_ENGINE_HOST_SSH_PORT - if self.environment[key] is None: + if port is None: interactive = True port = int( self.dialog.queryString( @@ -237,8 +237,13 @@ ) sf = self._client.open_sftp() res = None - with sf.open(file_name, 'r') as f: + f = None + try: + f = sf.open(file_name, 'r') res = f.read() + finally: + if f: + f.close() return res def copy_to_engine( @@ -255,8 +260,13 @@ ) ) sf = self._client.open_sftp() - with sf.open(file_name, 'w') as f: + f = None + try: + f = sf.open(file_name, 'w') f.write(content) + finally: + if f: + f.close() def cleanup(self): if self._client: -- To view, visit http://gerrit.ovirt.org/34055 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I730d15670bd9aa5dc68d6d1f93157c5895429491 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
