arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 2.0

Browse Source
This commit is contained in:
Julien Duponchelle 2016-07-19 16:41:12 +02:00
commit 73d5066392
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/compute/project.py
View File

@ -438,9 +438,9 @@ class Project:
# We merge the data from all server in the same project-files directory # We merge the data from all server in the same project-files directory
node_directory = os.path.join(self._path, "servers", "vm") node_directory = os.path.join(self._path, "servers", "vm")
if os.path.commonprefix([root, node_directory]) == node_directory: if os.path.commonprefix([root, node_directory]) == node_directory:
z.write(path, os.path.relpath(path, node_directory)) z.write(path, os.path.relpath(path, node_directory), compress_type=zipfile.ZIP_DEFLATED)
else: else:
z.write(path, os.path.relpath(path, self._path)) z.write(path, os.path.relpath(path, self._path), compress_type=zipfile.ZIP_DEFLATED)
return z return z
def _export_images(self, image, type, z): def _export_images(self, image, type, z):