don't always overwrite the error_msg

error_msg='Failed to upload file {0!r}: {1}\n{2}', is in scp_file
fix pylint errors
Merge pull request #13379 from gtmanfred/exec_ssh_cmd

don't always overwrite the error_msg