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

Fixes #270. Relative paths management with empty ones.

Browse Source
This commit is contained in:
Jeremy 2015-04-24 17:27:32 -06:00
parent 24bfd8ab53
commit fa544ef888
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gns3server/modules/base_manager.py
View File

@ -380,8 +380,9 @@ class BaseManager:
:return: file path :return: file path
""" """
if not path:
return ""
img_directory = self.get_images_directory() img_directory = self.get_images_directory()
if not os.path.isabs(path): if not os.path.isabs(path):
s = os.path.split(path) s = os.path.split(path)
return os.path.normpath(os.path.join(img_directory, *s)) return os.path.normpath(os.path.join(img_directory, *s))
@ -397,6 +398,8 @@ class BaseManager:
:return: file path :return: file path
""" """
if not path:
return ""
img_directory = self.get_images_directory() img_directory = self.get_images_directory()
path = self.get_abs_image_path(path) path = self.get_abs_image_path(path)
if os.path.dirname(path) == img_directory: if os.path.dirname(path) == img_directory:
@ -407,4 +410,5 @@ class BaseManager:
""" """
Get the image directory on disk Get the image directory on disk
""" """
raise NotImplementedError raise NotImplementedError