arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-05-28 19:58:53 +00:00
Code Issues Releases Wiki Activity

Catch error when you can't mark a project as no longer temporary

Browse Source 
Fix #172
This commit is contained in:
Julien Duponchelle 2015-05-05 10:51:51 +02:00
parent 22efc7488f
commit 18c4154376
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gns3server/modules/project.py
View File

@ -152,8 +152,7 @@ class Project:
try: try:
shutil.rmtree(old_path) shutil.rmtree(old_path)
except OSError as e: except OSError as e:
raise aiohttp.web.HTTPConflict("Can't remove temporary directory {}: {}".format(old_path ,e)) raise aiohttp.web.HTTPConflict("Can't remove temporary directory {}: {}".format(old_path, e))
@property @property
def name(self): def name(self):
@ -241,7 +240,10 @@ class Project:
raise aiohttp.web.HTTPInternalServerError(text="Could not create temporary project: {}".format(e)) raise aiohttp.web.HTTPInternalServerError(text="Could not create temporary project: {}".format(e))
else: else:
if os.path.exists(os.path.join(self._path, ".gns3_temporary")): if os.path.exists(os.path.join(self._path, ".gns3_temporary")):
os.remove(os.path.join(self._path, ".gns3_temporary")) try:
os.remove(os.path.join(self._path, ".gns3_temporary"))
except OSError as e:
raise aiohttp.web.HTTPInternalServerError(text="Could not mark project as no longer temporary: {}".format(e))
def module_working_directory(self, module_name): def module_working_directory(self, module_name):
""" """