Backed out changeset 4034fbcc0a55 (bug 1501802) for causing mass mochitest failures.

This commit is contained in:
Cosmin Sabou 2018-11-10 15:21:03 +02:00
parent a032e8985d
commit 128b3dd055
2 changed files with 6 additions and 4 deletions

View File

@ -494,9 +494,10 @@ def fetch_file(base_urls, file_record, grabchunk=1024 * 4, auth_file=None, regio
(file_record.filename, base_url, temp_path))
fetched_path = temp_path
break
except (urllib2.URLError, urllib2.HTTPError, ValueError):
except (urllib2.URLError, urllib2.HTTPError, ValueError) as e:
log.info("...failed to fetch '%s' from %s" %
(file_record.filename, base_url), exc_info=True)
(file_record.filename, base_url))
log.debug("%s" % e)
except IOError: # pragma: no cover
log.info("failed to write to temporary file for '%s'" %
file_record.filename, exc_info=True)

View File

@ -492,9 +492,10 @@ def fetch_file(base_urls, file_record, grabchunk=1024 * 4, auth_file=None, regio
(file_record.filename, base_url, temp_path))
fetched_path = temp_path
break
except (urllib2.URLError, urllib2.HTTPError, ValueError):
except (urllib2.URLError, urllib2.HTTPError, ValueError) as e:
log.info("...failed to fetch '%s' from %s" %
(file_record.filename, base_url), exc_info=True)
(file_record.filename, base_url))
log.debug("%s" % e)
except IOError: # pragma: no cover
log.info("failed to write to temporary file for '%s'" %
file_record.filename, exc_info=True)