NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-01-31 05:13:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Catch permission errors when listing images

Browse Source 
Fix #1608
This commit is contained in:
Julien Duponchelle 2016-10-26 10:53:14 +02:00
parent 1080147cf5
commit 048d2c12d0
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gns3server/controller/compute.py
View File

@ -539,15 +539,18 @@ class Compute:
res = yield from self.http_query("GET", "/{}/images".format(type), timeout=120) res = yield from self.http_query("GET", "/{}/images".format(type), timeout=120)
images = res.json images = res.json
if type in ["qemu", "dynamips", "iou"]: try:
for path in scan_for_images(type): if type in ["qemu", "dynamips", "iou"]:
image = os.path.basename(path) for path in scan_for_images(type):
if image not in [i['filename'] for i in images]: image = os.path.basename(path)
images.append({"filename": image, if image not in [i['filename'] for i in images]:
"path": image, images.append({"filename": image,
"md5sum": md5sum(path), "path": image,
"filesize": os.stat(path).st_size "md5sum": md5sum(path),
}) "filesize": os.stat(path).st_size
})
except OSError as e:
raise aiohttp.web.HTTPConflict(text="Can't scan for images: {}".format(str(e)))
return images return images
@asyncio.coroutine @asyncio.coroutine