Merge branch '1.5' into 2.0

Conflicts:
	gns3server/version.py
This commit is contained in:
grossmj committed 2016-05-29 19:52:15 -06:00
commit c1aad550fa
5 files changed
+39 -41

No files matched your search

+8
View File
@@ -424,6 +424,14 @@ class Project:
for file in files:
path = os.path.join(root, file)
# Try open the file
try:
open(path).close()
except OSError as e:
msg = "Could not export file {}: {}".format(path, e)
log.warn(msg)
self.emit("log.warning", {"message": msg})
continue
# We rename the .gns3 project.gns3 to avoid the task to the client to guess the file name
if file.endswith(".gns3"):
self._export_project_file(path, z, include_images)