Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/controller/__init__.py
#	gns3server/crash_report.py
#	gns3server/handlers/api/controller/node_handler.py
#	gns3server/utils/images.py
This commit is contained in:
grossmj committed 2023-08-02 18:26:50 +10:00
commit 1d59afa9fb
3 files changed
+13 -8

No files matched your search

+1
View File
@@ -247,6 +247,7 @@ def md5sum(path, working_dir=None, stopped_event=None, cache_to_md5file=True):
try:
m = hashlib.md5()
log.debug(f"Calculating MD5 sum of `{path}`")
with open(path, "rb") as f:
while True:
if stopped_event is not None and stopped_event.is_set():