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

Fix bug preventing to export portable projects with IOU images.

Browse Source
This commit is contained in:
grossmj 2018-03-08 00:13:35 +07:00
parent 0fde1cf54a
commit 22db13d2bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gns3server/controller/export_project.py
View File

@ -64,7 +64,6 @@ def export_project(project, temporary_dir, include_images=False, keep_compute_id
for root, dirs, files in os.walk(project._path, topdown=True): for root, dirs, files in os.walk(project._path, topdown=True):
files = [f for f in files if not _filter_files(os.path.join(root, f))] files = [f for f in files if not _filter_files(os.path.join(root, f))]
for file in files: for file in files:
path = os.path.join(root, file) path = os.path.join(root, file)
# Try open the file # Try open the file
@ -162,9 +161,12 @@ def _export_project_file(project, path, z, include_images, keep_compute_id, allo
if "properties" in node and node["node_type"] != "docker": if "properties" in node and node["node_type"] != "docker":
for prop, value in node["properties"].items(): for prop, value in node["properties"].items():
if not prop.endswith("image"):
continue
if node["node_type"] == "iou":
if not prop == "path":
continue
elif not prop.endswith("image"):
continue
if value is None or value.strip() == '': if value is None or value.strip() == '':
continue continue
@ -214,7 +216,6 @@ def _export_local_images(project, image, z):
continue continue
directory = os.path.split(img_directory)[-1:][0] directory = os.path.split(img_directory)[-1:][0]
if os.path.exists(image): if os.path.exists(image):
path = image path = image
else: else:
@ -262,7 +263,6 @@ def _export_remote_images(project, compute_id, image_type, image, project_zipfil
f.write(data) f.write(data)
response.close() response.close()
f.close() f.close()
arcname = os.path.join("images", image_type, image) arcname = os.path.join("images", image_type.upper(), image)
log.info("Saved {}".format(arcname)) log.info("Saved {}".format(arcname))
project_zipfile.write(temp_path, arcname=arcname, compress_type=zipfile.ZIP_DEFLATED) project_zipfile.write(temp_path, arcname=arcname, compress_type=zipfile.ZIP_DEFLATED)