arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

Fix crash when loading as GNS3 a non topology

Browse Source 
Fix #692
This commit is contained in:
Julien Duponchelle 2016-09-29 14:08:07 +02:00
parent 79d376652c
commit cfd74a8164
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/controller/topology.py
View File

@ -91,7 +91,7 @@ def load_topology(path):
try: try:
with open(path, encoding="utf-8") as f: with open(path, encoding="utf-8") as f:
topo = json.load(f) topo = json.load(f)
except (OSError, UnicodeEncodeError, json.JSONDecodeError) as e: except (OSError, UnicodeDecodeError, json.JSONDecodeError) as e:
raise aiohttp.web.HTTPConflict(text="Could not load topology {}: {}".format(path, str(e))) raise aiohttp.web.HTTPConflict(text="Could not load topology {}: {}".format(path, str(e)))
if "revision" not in topo or topo["revision"] < GNS3_FILE_FORMAT_REVISION: if "revision" not in topo or topo["revision"] < GNS3_FILE_FORMAT_REVISION:
# If it's an old GNS3 file we need to convert it # If it's an old GNS3 file we need to convert it