Blame SOURCES/BZ-1233329-timedhosts-parsing-error-handling.patch
|
 |
babe2e |
commit 7644d090e186c44d577f8d06de57bd815e0dc8b0
|
|
|
babe2e |
Author: Valentina Mukhamedzhanova <vmukhame@redhat.com>
|
|
|
babe2e |
Date: Tue Jun 23 10:00:12 2015 +0200
|
|
|
babe2e |
|
|
|
babe2e |
Don't crash on timedhosts parsing error. BZ#1233329
|
|
|
babe2e |
|
|
|
babe2e |
diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
|
|
|
babe2e |
index 91cdbdd..f09d4a5 100644
|
|
|
babe2e |
--- a/urlgrabber/grabber.py
|
|
|
babe2e |
+++ b/urlgrabber/grabber.py
|
|
|
babe2e |
@@ -2377,8 +2377,11 @@ class _TH:
|
|
|
babe2e |
try:
|
|
|
babe2e |
now = int(time.time())
|
|
|
babe2e |
for line in open(filename):
|
|
|
babe2e |
- host, speed, fail, ts = line.rsplit(' ', 3)
|
|
|
babe2e |
- _TH.hosts[host] = int(speed), int(fail), min(int(ts), now)
|
|
|
babe2e |
+ try:
|
|
|
babe2e |
+ host, speed, fail, ts = line.rsplit(' ', 3)
|
|
|
babe2e |
+ _TH.hosts[host] = int(speed), int(fail), min(int(ts), now)
|
|
|
babe2e |
+ except ValueError:
|
|
|
babe2e |
+ if DEBUG: DEBUG.info('Error parsing timedhosts: line "%s"', line)
|
|
|
babe2e |
except IOError: pass
|
|
|
babe2e |
_TH.dirty = False
|
|
|
babe2e |
|