Merge remote-tracking branch 'upstream/master'

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

diff --git a/nominatim/api/status.py b/nominatim/api/status.py
index adccf7a55409ef240f040c83a87c2f112f73af1a..1069184c88e8bc9655111b737b3a060731d931e6 100644 (file)
--- a/nominatim/api/status.py
+++ b/nominatim/api/status.py
@@ -5,7 +5,7 @@
 # Copyright (C) 2023 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """
 # Copyright (C) 2023 by the Nominatim developer community.
 # For a full list of authors see the git log.
 """

-Classes and function releated to status call.
+Classes and function related to status call.

 """
 from typing import Optional
 import datetime as dt
 """
 from typing import Optional
 import datetime as dt


@@ -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: