mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-09-07 21:58:41 +02:00
Code Activity

socket timeouts don't work with m2crypto

Browse Source
This commit is contained in:
Ludwig Nussel
2009-10-02 11:26:07 +00:00
parent f8545f8dcf
commit 9dd2878642
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osc/core.py
View File

@@ -1845,11 +1845,14 @@ def http_request(method, url, headers={}, data=None, file=None, timeout=100):
if conf.config['debug']: print method, url
old_timeout = socket.getdefaulttimeout()
socket.setdefaulttimeout(timeout)
# XXX: dirty hack as timeout doesn't work with python-m2crypto
if old_timeout != timeout and api_host_options['sslcertck'] == 0:
socket.setdefaulttimeout(timeout)
try:
fd = urllib2.urlopen(req, data=data)
finally:
socket.setdefaulttimeout(old_timeout)
if old_timeout != timeout and api_host_options['sslcertck'] == 0:
socket.setdefaulttimeout(old_timeout)
if hasattr(conf.cookiejar, 'save'):
conf.cookiejar.save(ignore_discard=True)