jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Workaround splitdrive limitations

Browse source 
splitdrive doesn't handle relative paths, so if volume_path contains
a relative path, we handle that differently and manually set drive to ''.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-10-13 17:27:25 +01:00
commit c1d5ecaafe
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
compose/config/config.py
View file

@ -526,7 +526,18 @@ def path_mappings_from_dict(d):
def split_path_mapping(volume_path):
drive, volume_config = os.path.splitdrive(volume_path)
"""
Ascertain if the volume_path contains a host path as well as a container
path. Using splitdrive so windows absolute paths won't cause issues with
splitting on ':'.
"""
# splitdrive has limitations when it comes to relative paths, so when it's
# relative, handle special case to set the drive to ''
if volume_path.startswith('.') or volume_path.startswith('~'):
drive, volume_config = '', volume_path
else:
drive, volume_config = os.path.splitdrive(volume_path)
if ':' in volume_config:
(host, container) = volume_config.split(':', 1)
return (container, drive + host)