Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/crash_report.py
#	gns3server/static/web-ui/index.html
#	gns3server/version.py
#	tests/compute/docker/test_docker_vm.py
This commit is contained in:
grossmj committed 2024-03-05 01:05:46 +08:00
commit e9827653ae
15 files changed
+269 -13

No files matched your search

+5
View File
@@ -102,6 +102,11 @@ async def export_project(
continue
_patch_mtime(path)
zstream.write(path, os.path.relpath(path, project._path))
# save empty directories
for directory in dirs:
path = os.path.join(root, directory)
if not os.listdir(path):
zstream.write(path, os.path.relpath(path, project._path))
except FileNotFoundError as e:
log.warning(f"Cannot export local file: {e}")
continue