Merge branch 'master' into 2.0

pull/638/head
Julien Duponchelle 8 years ago
commit 73d5066392
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8

@ -438,9 +438,9 @@ class Project:
# We merge the data from all server in the same project-files directory
node_directory = os.path.join(self._path, "servers", "vm")
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:
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
def _export_images(self, image, type, z):

Loading…
Cancel
Save