Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

packaging: setup: remote_engine: manual_files: Read as binary #645

Merged

Conversation

didib
Copy link
Member

@didib didib commented Sep 8, 2022

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 didi@redhat.com

didib added a commit to didib/ovirt-dwh that referenced this pull request Sep 8, 2022
This reverts commit 40b2df1.

I think that patch was merged to fix a bug in manual_files, but broke
root_ssh. [2] is an alternative, which should make both work.

[2] oVirt/ovirt-engine#645
Copy link
Member

@sandrobonazzola sandrobonazzola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

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 <didi@redhat.com>
@didib didib force-pushed the remote-engine-manual-files-return-bytes branch from 0a1e228 to 2c64f53 Compare September 13, 2022 14:22
Copy link
Member

@mwperina mwperina left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@mwperina mwperina merged commit f3525c0 into oVirt:master Sep 15, 2022
mwperina pushed a commit to oVirt/ovirt-dwh that referenced this pull request Sep 20, 2022
This reverts commit 40b2df1.

I think that patch was merged to fix a bug in manual_files, but broke
root_ssh. [2] is an alternative, which should make both work.

[2] oVirt/ovirt-engine#645
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants