Skip to content

Commit

Permalink
Fix load_url retry for binary streams
Browse files Browse the repository at this point in the history
This is a pretty old bug in the original binary stream implementation.

Fixes 8f4121c
  • Loading branch information
cottsay committed Oct 19, 2024
1 parent 48b6fa8 commit 0c29bfb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/rosdistro/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ def load_url(url, retry=2, retry_period=1, timeout=10, skip_decode=False):
except HTTPError as e:
if e.code in [500, 502, 503] and retry:
time.sleep(retry_period)
return load_url(url, retry=retry - 1, retry_period=retry_period, timeout=timeout)
return load_url(url, retry=retry - 1, retry_period=retry_period, timeout=timeout, skip_decode=skip_decode)
e.msg += ' (%s)' % url
raise
except URLError as e:
if isinstance(e.reason, socket.timeout) and retry:
time.sleep(retry_period)
return load_url(url, retry=retry - 1, retry_period=retry_period, timeout=timeout)
return load_url(url, retry=retry - 1, retry_period=retry_period, timeout=timeout, skip_decode=skip_decode)
raise URLError(str(e) + ' (%s)' % url)
except socket.timeout as e:
raise socket.timeout(str(e) + ' (%s)' % url)
Expand Down

0 comments on commit 0c29bfb

Please sign in to comment.