fix timezone handling for timestamps from the database

[nominatim.git] / nominatim / api / status.py

diff --git a/nominatim/api/status.py b/nominatim/api/status.py
index adccf7a55409ef240f040c83a87c2f112f73af1a..8ac92f35835d0914e1d069b4cfef276ff95ac8e6 100644 (file)
--- a/nominatim/api/status.py
+++ b/nominatim/api/status.py
@@ -37,7 +37,10 @@ async def get_status(conn: SearchConnection) -> StatusResult:
     status.data_updated = await conn.scalar(sql)
 
     if status.data_updated is not None:
     status.data_updated = await conn.scalar(sql)
 
     if status.data_updated is not None:

-        status.data_updated = status.data_updated.replace(tzinfo=dt.timezone.utc)
+        if status.data_updated.tzinfo is None:
+            status.data_updated = status.data_updated.replace(tzinfo=dt.timezone.utc)
+        else:
+            status.data_updated = status.data_updated.astimezone(dt.timezone.utc)

 
     # Database version
     try:
 
     # Database version
     try: