Skip to content

Commit

Permalink
Enable system certificate store later in the code and bump version to…
Browse files Browse the repository at this point in the history
… 2.2.42.dev4
  • Loading branch information
grossmj committed Aug 8, 2023
1 parent 8abb502 commit 72960f8
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
21 changes: 11 additions & 10 deletions gns3/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,6 @@
import signal
import psutil

import logging
log = logging.getLogger(__name__)

try:
import truststore
truststore.inject_into_ssl()
log.info("Using system certificate store for SSL connections")
except ImportError:
pass

try:
from gns3.qt import QtCore, QtWidgets
except ImportError:
Expand All @@ -73,6 +63,10 @@
from gns3.version import __version__


import logging
log = logging.getLogger(__name__)


def locale_check():
"""
Checks if this application runs with a correct locale (i.e. supports UTF-8 encoding) and attempt to fix
Expand Down Expand Up @@ -141,6 +135,13 @@ def main():
if options.project:
options.project = os.path.abspath(options.project)

try:
import truststore
truststore.inject_into_ssl()
log.info("Using system certificate store for SSL connections")
except ImportError:
pass

if hasattr(sys, "frozen"):
# We add to the path where the OS search executable our binary location starting by GNS3
# packaged binary
Expand Down
2 changes: 1 addition & 1 deletion gns3/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# or negative for a release candidate or beta (after the base version
# number has been incremented)

__version__ = "2.2.42.dev3"
__version__ = "2.2.42.dev4"
__version_info__ = (2, 2, 42, 99)

if "dev" in __version__:
Expand Down

0 comments on commit 72960f8

Please sign in to comment.