ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-12-20 05:17:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle 2016-09-08 11:52:16 +02:00
commit cfe834afc4
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/file_format.rst
View File

@ -45,6 +45,8 @@ The .gns3p or .gns3project
It's a zipped version of the .gns3 and all files require for It's a zipped version of the .gns3 and all files require for
a topology. The images could be included inside but are optionnals. a topology. The images could be included inside but are optionnals.
The zip could be a ZIP64 if the project is too big for standard
zip file.
The .gns3a or .gns3appliance The .gns3a or .gns3appliance
############################# #############################

2
gns3server/controller/export_project.py
View File

@ -43,7 +43,7 @@ def export_project(project, temporary_dir, include_images=False, keep_compute_id
if project.is_running(): if project.is_running():
raise aiohttp.web.HTTPConflict(text="Running topology could not be exported") raise aiohttp.web.HTTPConflict(text="Running topology could not be exported")
z = zipstream.ZipFile() z = zipstream.ZipFile(allowZip64=True)
# First we process the .gns3 in order to be sure we don't have an error # First we process the .gns3 in order to be sure we don't have an error
for file in os.listdir(project._path): for file in os.listdir(project._path):

2
gns3server/controller/topology.py
View File

@ -465,7 +465,7 @@ def _convert_snapshots(topo_dir):
if is_gns3_topo: if is_gns3_topo:
snapshot_arc = os.path.join(new_snapshots_dir, snapshot + ".gns3project") snapshot_arc = os.path.join(new_snapshots_dir, snapshot + ".gns3project")
with zipfile.ZipFile(snapshot_arc, 'w') as myzip: with zipfile.ZipFile(snapshot_arc, 'w', allowZip64=True) as myzip:
for root, dirs, files in os.walk(snapshot_dir): for root, dirs, files in os.walk(snapshot_dir):
for file in files: for file in files:
myzip.write(os.path.join(root, file), os.path.relpath(os.path.join(root, file), snapshot_dir), compress_type=zipfile.ZIP_DEFLATED) myzip.write(os.path.join(root, file), os.path.relpath(os.path.join(root, file), snapshot_dir), compress_type=zipfile.ZIP_DEFLATED)