Skip to content

Commit b2f0c7a

Browse files
committed
use proper function to check version
1 parent 0100286 commit b2f0c7a

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

mergin/client.py

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,23 +1368,6 @@ def server_config(self) -> dict:
13681368
response = self.get("/config")
13691369
return json.load(response)
13701370

1371-
def server_version_newer_or_equal_than(self, required_version: str) -> bool:
1372-
"""Check if the server version is newer or equal to the specified version."""
1373-
required_major, required_minor, required_fix = required_version.split(".")
1374-
server_version = self.server_version()
1375-
if server_version:
1376-
server_major, server_minor, server_fix = server_version.split(".")
1377-
return (
1378-
int(server_major) > int(required_major)
1379-
or (int(server_major) == int(required_major) and int(server_minor) > int(required_minor))
1380-
or (
1381-
int(server_major) == int(required_major)
1382-
and int(server_minor) == int(required_minor)
1383-
and int(server_fix) >= int(required_fix)
1384-
)
1385-
)
1386-
return False
1387-
13881371
def send_logs(
13891372
self,
13901373
logfile: str,
@@ -1402,7 +1385,7 @@ def send_logs(
14021385
config = self.server_config()
14031386
diagnostic_logs_url = config.get("diagnostic_logs_url", None)
14041387

1405-
if self.server_version_newer_or_equal_than("2023.4.1") and (
1388+
if is_version_acceptable(self.server_version(), "2025.4.1") and (
14061389
diagnostic_logs_url is None or diagnostic_logs_url == ""
14071390
):
14081391
url = self.url() + "?" + urllib.parse.urlencode(params)

0 commit comments

Comments
 (0)