importer: Skip lines we cannot decode

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/scripts/location-importer.in b/src/scripts/location-importer.in
index 7b47668c43dcadaf10729c83ffc3a6060e55029e..e1ec8738517f84a8ffa5ef4ac397835d84fbd1ab 100644 (file)
--- a/src/scripts/location-importer.in
+++ b/src/scripts/location-importer.in
@@ -1325,7 +1325,14 @@ class CLI(object):
                                        for line in f:
                                                lineno += 1
 
-                                               line = line.decode()
+                                               try:
+                                                       line = line.decode()
+
+                                               # Ignore any lines we cannot decode
+                                               except UnicodeDecodeError:
+                                                       log.debug("Could not decode line %s in %s" \
+                                                               % (lineno, geofeed.url))
+                                                       continue
 
                                                # Strip any newline
                                                line = line.rstrip()