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

Avoid crash when you broke your system permissions

Browse Source 
Fix #877
This commit is contained in:
Julien Duponchelle 2017-01-27 10:56:48 +01:00
parent 267a5ae3a8
commit 2da20177a2
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gns3server/utils/images.py
View File

@ -130,8 +130,11 @@ def images_directories(type):
paths = [] paths = []
img_dir = os.path.expanduser(server_config.get("images_path", "~/GNS3/images")) img_dir = os.path.expanduser(server_config.get("images_path", "~/GNS3/images"))
type_img_directory = default_images_directory(type) type_img_directory = default_images_directory(type)
os.makedirs(type_img_directory, exist_ok=True) try:
paths.append(type_img_directory) os.makedirs(type_img_directory, exist_ok=True)
paths.append(type_img_directory)
except (OSError, PermissionError):
pass
for directory in server_config.get("additional_images_path", "").split(";"): for directory in server_config.get("additional_images_path", "").split(";"):
paths.append(directory) paths.append(directory)
# Compatibility with old topologies we look in parent directory # Compatibility with old topologies we look in parent directory