Skip to content
Snippets Groups Projects
Commit c198c3a1 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

package/win32: fix relative path joining with older Python

It's not supported with a Path before 3.6 [1].

[1] https://docs.python.org/3/library/os.path.html#os.path.join
parent 075e167c
No related branches found
No related tags found
1 merge request!6394package/win32: remove -pdb option from heat Python script
Pipeline #538283 failed with stages
in 45 minutes and 3 seconds
......@@ -64,7 +64,7 @@ def outputDir(top, parent: str, dir: str):
if not file.is_dir():
# args.out.write(' file <{}>\r\n'.format(file))
if not file.name.endswith('.pdb'):
outname = os.path.join(top.name, file.relative_to(top))
outname = os.path.join(top.name, str(file.relative_to(top)))
fileId = generate_id('cmp', outname)
args.out.write(' <Component Id="{}" Guid="*">\r\n'.format(fileId))
fileIdList.append(fileId)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment