Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / tools / replication.py

diff --git a/nominatim/tools/replication.py b/nominatim/tools/replication.py
index cb201b1ef965a5d3801f4132da6f41570720ea75..a0a741e8ff4ae87155ff38853784d1af41b66ce3 100644 (file)
--- a/nominatim/tools/replication.py
+++ b/nominatim/tools/replication.py
@@ -115,10 +115,12 @@ def update(conn, options):
 
     # Consume updates with osm2pgsql.
     options['append'] = True
 
     # Consume updates with osm2pgsql.
     options['append'] = True

+    options['disable_jit'] = conn.server_version_tuple() >= (11, 0)

     run_osm2pgsql(options)
 
     # Write the current status to the file
     endstate = repl.get_state_info(endseq)
     run_osm2pgsql(options)
 
     # Write the current status to the file
     endstate = repl.get_state_info(endseq)

-    status.set_status(conn, endstate.timestamp, seq=endseq, indexed=False)
+    status.set_status(conn, endstate.timestamp if endstate else None,
+                      seq=endseq, indexed=False)

 
     return UpdateState.UP_TO_DATE
 
     return UpdateState.UP_TO_DATE