arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Get server resource independant of working directory

Browse Source
This commit is contained in:
Julien Duponchelle 2015-05-28 13:24:45 +02:00
parent 85c185604e
commit ada94d486a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/crash_report.py
View File

@ -55,7 +55,7 @@ class CrashReport:
DSN = "sync+https://9e6f04df72c74b6894a6dcd2928d069e:2035d1beb1654136b170f1e91f05ee51@app.getsentry.com/38482" DSN = "sync+https://9e6f04df72c74b6894a6dcd2928d069e:2035d1beb1654136b170f1e91f05ee51@app.getsentry.com/38482"
if hasattr(sys, "frozen"): if hasattr(sys, "frozen"):
cacert = get_resource("cacert.pem") cacert = get_resource("cacert.pem")
if os.path.isfile(cacert): if cacert is not None and os.path.isfile(cacert):
DSN += "?ca_certs={}".format(cacert) DSN += "?ca_certs={}".format(cacert)
else: else:
log.warning("The SSL certificate bundle file '{}' could not be found".format(cacert)) log.warning("The SSL certificate bundle file '{}' could not be found".format(cacert))

8
gns3server/utils/get_resource.py
View File

@ -50,10 +50,10 @@ def get_resource(resource_name):
resource_path = None resource_path = None
if hasattr(sys, "frozen") and sys.platform.startswith("darwin"): if hasattr(sys, "frozen") and sys.platform.startswith("darwin"):
resource_name = os.path.join("../Resources", resource_name) resource_name = os.path.join(os.path.dirname(sys.executable), "../Resources", resource_name)
if hasattr(sys, "frozen") and os.path.exists(resource_name): if hasattr(sys, "frozen") and os.path.exists(resource_name):
resource_path = os.path.normpath(os.path.join(os.getcwd(), resource_name)) resource_path = os.path.normpath(os.path.join(os.path.dirname(sys.executable), resource_name))
elif not hasattr(sys, "frozen") and pkg_resources.resource_exists("gns3", resource_name): elif not hasattr(sys, "frozen") and pkg_resources.resource_exists("gns3server", resource_name):
resource_path = pkg_resources.resource_filename("gns3", resource_name) resource_path = pkg_resources.resource_filename("gns3server", resource_name)
resource_path = os.path.normpath(resource_path) resource_path = os.path.normpath(resource_path)
return resource_path return resource_path