saltstack/salt — pull request #13379 by gtmanfred (2014-06-10 23:03:44+00:00)
Title: don't always overwrite the error_msg

error_msg='Failed to upload file {0!r}: {1}\n{2}', is in scp_file