]> git.ipfire.org Git - people/ms/libloc.git/commitdiff
location-importer: Abort when we could not get a greeting from route server
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 May 2020 10:05:12 +0000 (10:05 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 May 2020 10:05:12 +0000 (10:05 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/python/location-importer.in

index f9c87f672ed9577688208fdeed6749633abcfb14..57eccd9360e6740e38b89bf392d3503e447d9b31 100644 (file)
@@ -472,8 +472,10 @@ class CLI(object):
                        #       t.set_debuglevel(10)
 
                        # Wait for console greeting
-                       greeting = t.read_until(b"> ")
-                       log.debug(greeting.decode())
+                       greeting = t.read_until(b"> ", timeout=30)
+                       if not greeting:
+                               log.error("Could not get a console prompt")
+                               return 1
 
                        # Disable pagination
                        t.write(b"terminal length 0\n")