NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-16 16:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue when searching for image with relative path. Fixes #1925

Browse Source
This commit is contained in:
grossmj 2021-08-25 17:23:21 +09:30
parent 27bcb60580
commit 6005e89181
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/compute/base_manager.py
View File

@ -544,8 +544,7 @@ class BaseManager:
s = os.path.split(searched_file) s = os.path.split(searched_file)
for root, dirs, files in os.walk(directory): for root, dirs, files in os.walk(directory):
for file in files: for file in files:
# If filename is the same if s[1] == file and (s[0] == '' or root == os.path.join(directory, s[0])):
if s[1] == file and (s[0] == '' or os.path.basename(s[0]) == os.path.basename(root)):
path = os.path.normpath(os.path.join(root, s[1])) path = os.path.normpath(os.path.join(root, s[1]))
if os.path.exists(path): if os.path.exists(path):
return path return path