Skip to content

Fix trustore import error #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harminius wants to merge 9 commits into
base: master
Choose a base branch
from
+7 −3
Open

Fix trustore import error #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
201b074
Try to import trustore and catch the exception if it fails. This allo…
harminius Aug 6, 2026
788b953
log trustore import error
harminius Aug 7, 2026
02678e4
black
harminius Aug 7, 2026
9128088
test with python 3.9
harminius Aug 7, 2026
c4db5bc
test with python 3.9 try2
harminius Aug 7, 2026
f8bf96d
test with python 3.9 try3
harminius Aug 7, 2026
7442ee0
test with python 3.9 try4
harminius Aug 7, 2026
050051e
back python 3.10
harminius Aug 7, 2026
dc6b7aa
back python 3.10 2
harminius Aug 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions mergin/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"}

Expand Down
2 changes: 1 addition & 1 deletion mergin/client_pull.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading