packaging: setup: remote_engine: manual_files: Read as binary

Make remote_engine_manual_files.py match the behavior of remote_engine_root_ssh.py, and so make 'copy_from_engine' return a bytes object, not str. This should fix the bug that [1] was supposed to fix, but [1] only fixed it for the 'manual files' mode and broke paramiko/ssh. [1] oVirt/ovirt-dwh@885d65f Change-Id: I32cd8aff5e851fb053b2cd5b8237455ce2230a35 Signed-off-by: Yedidyah Bar David <[email protected]>
oVirt · Sep 15, 2022 · f3525c0 · f3525c0
1 parent 5cdce04
commit f3525c0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_manual_files.py b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_manual_files.py
@@ -83,7 +83,7 @@ def copy_from_engine(self, file_name, dialog_name=None):
                 ),
                 prompt=True,
             )
-            with open(resfilename) as f:
+            with open(resfilename, 'rb') as f:
                 res = f.read()
             return res