Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug 9811; Relative media path incorrectly calculated for Windows

Browse Source
This commit is contained in:
prculley 2016-12-01 10:23:27 -06:00
parent 27c2b0c81d
commit e94696ecf0
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/gen/utils/file.py
View File

@ -137,12 +137,16 @@ def relative_path(original, base):
base_list = [_f for _f in base_list if _f] base_list = [_f for _f in base_list if _f]
target_list = [_f for _f in target_list if _f] target_list = [_f for _f in target_list if _f]
i = -1 i = -1
# base path is normcase (lower case on Windows) so compare target in lower
# on Windows as well
for i in range(min(len(base_list), len(target_list))): for i in range(min(len(base_list), len(target_list))):
if base_list[i] != target_list[i]: break if base_list[i] != (target_list[i].lower() if win()
else target_list[i]):
break
else: else:
#if break did not happen we are here at end, and add 1. #if break did not happen we are here at end, and add 1.
i += 1 i += 1
rel_list = [os.pardir] * (len(base_list)-i) + target_list[i:] rel_list = [os.pardir] * (len(base_list) - i) + target_list[i:]
return os.path.join(*rel_list) return os.path.join(*rel_list)
def expand_path(path, normalize = True): def expand_path(path, normalize = True):