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

Handle OSerror when listing images

Browse Source 
Fix #823
This commit is contained in:
Julien Duponchelle 2016-12-12 10:13:29 +01:00
parent 4bb990bf0c
commit 4cd08c8955
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gns3server/controller/compute.py
View File

@ -563,10 +563,13 @@ class Compute:
res = yield from self.http_query("GET", "/{}/images".format(type), timeout=None) res = yield from self.http_query("GET", "/{}/images".format(type), timeout=None)
images = res.json images = res.json
if type in ["qemu", "dynamips", "iou"]: try:
for local_image in list_images(type): if type in ["qemu", "dynamips", "iou"]:
if local_image['filename'] not in [i['filename'] for i in images]: for local_image in list_images(type):
images.append(local_image) if local_image['filename'] not in [i['filename'] for i in images]:
images.append(local_image)
except OSError as e:
raise ComputeError("Can't list images: {}".format(str(e)))
return images return images
@asyncio.coroutine @asyncio.coroutine