Skip to content

Commit 788b953

Browse files
committed
log trustore import error
1 parent 201b074 commit 788b953

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

mergin/client.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@
7575

7676
truststore.inject_into_ssl()
7777
except ImportError:
78-
pass
78+
logging.getLogger("mergin.client").warning(
79+
"truststore could not be imported, continuing without it"
80+
)
7981

8082
json_headers = {"Content-Type": "application/json"}
8183

mergin/client_pull.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,7 @@ def pull_project_finalize(job: PullJob):
701701
except NotImplementedError as e:
702702
job.mp.log.error("Failed to get project info v2 in this server version: " + str(e))
703703
job.mp.log.info("--- pull aborted")
704-
raise ClientError("Failed to get project info v2 as server not support it: " + str(e))
704+
raise ClientError("Failed to get project info v2 as server does not support it: " + str(e))
705705
except ClientError as e:
706706
job.mp.log.error("Failed to get project info v2: " + str(e))
707707
job.mp.log.info("--- pull aborted")

0 commit comments

Comments
 (0)