diff --git a/mergin/client.py b/mergin/client.py index 61b5235..1555051 100644 --- a/mergin/client.py +++ b/mergin/client.py @@ -11,7 +11,6 @@ import platform from datetime import datetime, timezone import dateutil.parser -import truststore from enum import Enum, auto import re import typing @@ -71,7 +70,12 @@ ) from .version import __version__ -truststore.inject_into_ssl() +try: + import truststore + + truststore.inject_into_ssl() +except ImportError: + logging.getLogger("mergin.client").warning("truststore could not be imported, continuing without it") json_headers = {"Content-Type": "application/json"} diff --git a/mergin/client_pull.py b/mergin/client_pull.py index f751949..5210089 100644 --- a/mergin/client_pull.py +++ b/mergin/client_pull.py @@ -701,7 +701,7 @@ def pull_project_finalize(job: PullJob): except NotImplementedError as e: job.mp.log.error("Failed to get project info v2 in this server version: " + str(e)) job.mp.log.info("--- pull aborted") - raise ClientError("Failed to get project info v2 as server not support it: " + str(e)) + raise ClientError("Failed to get project info v2 as server does not support it: " + str(e)) except ClientError as e: job.mp.log.error("Failed to get project info v2: " + str(e)) job.mp.log.info("--- pull aborted")