ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-18 15:28:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not recurse scan for images in standard image directory

Browse Source 
Fix https://github.com/GNS3/gns3-gui/issues/1680
This commit is contained in:
Julien Duponchelle
2016-11-28 19:49:50 +01:00
parent a36fc37250
commit 49315adf79
11 changed files with 156 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gns3server/controller/compute.py
View File

@ -26,7 +26,7 @@ import os
import io
from ..utils import parse_version
from ..utils.images import scan_for_images, md5sum
from ..utils.images import list_images, md5sum
from ..utils.asyncio import locked_coroutine
from ..controller.controller_error import ControllerError
from ..config import Config
@ -563,18 +563,10 @@ class Compute:
res = yield from self.http_query("GET", "/{}/images".format(type), timeout=None)
images = res.json
try:
if type in ["qemu", "dynamips", "iou"]:
for path in scan_for_images(type):
image = os.path.basename(path)
if image not in [i['filename'] for i in images]:
images.append({"filename": image,
"path": image,
"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)))
if type in ["qemu", "dynamips", "iou"]:
for local_image in list_images(type):
if local_image['filename'] not in [i['filename'] for i in images]:
images.append(local_image)
return images
@asyncio.coroutine