]> git.openstreetmap.org Git - nominatim.git/blobdiff - nominatim/tools/replication.py
remove unused BINDIR constant
[nominatim.git] / nominatim / tools / replication.py
index c7d0d3e5d8e2621d410c8e40bbb9adee1c2b68c8..cb201b1ef965a5d3801f4132da6f41570720ea75 100644 (file)
@@ -6,13 +6,18 @@ from enum import Enum
 import logging
 import time
 
-from osmium.replication.server import ReplicationServer
-from osmium import WriteHandler
-
 from ..db import status
 from .exec_utils import run_osm2pgsql
 from ..errors import UsageError
 
+try:
+    from osmium.replication.server import ReplicationServer
+    from osmium import WriteHandler
+except ModuleNotFoundError as exc:
+    logging.getLogger().fatal("pyosmium not installed. Replication functions not available.\n"
+                              "To install pyosmium via pip: pip3 install osmium")
+    raise UsageError("replication tools not available") from exc
+
 LOG = logging.getLogger()
 
 def init_replication(conn, base_url):
@@ -101,7 +106,7 @@ def update(conn, options):
     repl = ReplicationServer(options['base_url'])
 
     outhandler = WriteHandler(str(options['import_file']))
-    endseq = repl.apply_diffs(outhandler, startseq,
+    endseq = repl.apply_diffs(outhandler, startseq + 1,
                               max_size=options['max_diff_size'] * 1024)
     outhandler.close()