Merge pull request #8722 from cmbaughman/devel

Bugfix: #8720 winrm.py: protocol.send_message() crashes with https
This commit is contained in:
Michael DeHaan 2014-08-22 15:53:09 -04:00
commit b44e22aa68

View file

@ -87,7 +87,7 @@ class Connection(object):
_winrm_cache[cache_key] = protocol _winrm_cache[cache_key] = protocol
return protocol return protocol
except WinRMTransportError, exc: except WinRMTransportError, exc:
err_msg = str(exc.args[0]) err_msg = str(exc)
if re.search(r'Operation\s+?timed\s+?out', err_msg, re.I): if re.search(r'Operation\s+?timed\s+?out', err_msg, re.I):
raise errors.AnsibleError("the connection attempt timed out") raise errors.AnsibleError("the connection attempt timed out")
m = re.search(r'Code\s+?(\d{3})', err_msg) m = re.search(r'Code\s+?(\d{3})', err_msg)