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

ssh client copy_file bidirectional instead of always assuming local to remote copy #42

Merged
merged 3 commits into from
Mar 30, 2018

Conversation

margaret
Copy link
Contributor

@margaret margaret commented Mar 26, 2018

It still defaults to assuming local->remote, so previous uses of it shouldn't be affected

colin-msphere
colin-msphere previously approved these changes Mar 27, 2018
Copy link
Contributor

@colin-msphere colin-msphere left a comment

Choose a reason for hiding this comment

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

Looks good.

I have one question about the logging call.

cmd = ['scp'] + self.opt_list + ['-P', str(self.port)] + copy_command
log.debug('Copying {} to {}'.format(src, remote_full_path))
log.debug('Copying {} to {}'.format(*copy_command))
Copy link
Contributor

Choose a reason for hiding this comment

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

Does this log statement work if copy_command includes the -r? That would be more than 2 arguments?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ahh good catch, that wouldn't work. It doesn't throw an exception but it would log -r to src

Copy link

@mellenburg mellenburg left a comment

Choose a reason for hiding this comment

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

Just needs a fix for the log statement that @colin-msphere pointed out and then we should be able to merge this

@colin-msphere colin-msphere merged commit e4b137f into dcos:master Mar 30, 2018
@margaret
Copy link
Contributor Author

Oooo that's what the 'update branch' button does. Updates with master.

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