NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2026-08-27 12:30:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.2

Browse Source
This commit is contained in:
grossmj 2026-04-12 20:47:14 +08:00
commit 2b0b31b402
No known key found for this signature in database
GPG Key ID: 1E7DD6DBB53FF3D7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gns3server/controller/project.py
View File

@ -779,8 +779,9 @@ class Project:
try:
with open(self._snapshot_conf_path, encoding="utf-8") as f:
self._snapshot_conf = json.load(f)
except (OSError, UnicodeDecodeError, ValueError) as e:
raise aiohttp.web.HTTPConflict(text="Could not read snapshot config {}: {}".format(self._snapshot_conf_path, str(e)))
except (OSError, UnicodeDecodeError, ValueError):
log.exception("Could not read snapshot config %s", self._snapshot_conf_path)
raise aiohttp.web.HTTPConflict(text="Could not read snapshot configuration file")
# Load all legacy snapshots (.gns3project files) to create an initial snapshot config if it doesn't exist
if os.path.exists(snapshot_dir) and not self._snapshot_conf: