Tools: Fix recurring multiple times over the same library

This commit is contained in:
Vicki Pfau 2017-02-03 09:37:28 -08:00
parent aaec68ee48
commit ee5dbd9f82
2 changed files with 4 additions and 1 deletions

View File

@ -22,6 +22,7 @@ Bugfixes:
- Qt: Fix timing issues on high refresh rate monitors - Qt: Fix timing issues on high refresh rate monitors
- GBA Savedata: Fix savedata unmasking (fixes mgba.io/i/441) - GBA Savedata: Fix savedata unmasking (fixes mgba.io/i/441)
- Util: Fix overflow when loading invalid UPS patches - Util: Fix overflow when loading invalid UPS patches
- Tools: Fix recurring multiple times over the same library
Misc: Misc:
- SDL: Remove scancode key input - SDL: Remove scancode key input
- GBA Video: Clean up unused timers - GBA Video: Clean up unused timers

View File

@ -96,6 +96,7 @@ def updateMachO(bin, execPath, root):
if os.access(newPath, os.F_OK): if os.access(newPath, os.F_OK):
if verbose: if verbose:
print('Skipping copying {}, already done.'.format(oldPath)) print('Skipping copying {}, already done.'.format(oldPath))
newPath = None
elif os.path.abspath(oldPath) != os.path.abspath(newPath): elif os.path.abspath(oldPath) != os.path.abspath(newPath):
if verbose: if verbose:
print('Copying {} to {}...'.format(oldPath, newPath)) print('Copying {} to {}...'.format(oldPath, newPath))
@ -111,7 +112,8 @@ def updateMachO(bin, execPath, root):
args = [installNameTool] args = [installNameTool]
for path, oldExecPath, newExecPath in toUpdate: for path, oldExecPath, newExecPath in toUpdate:
if path != bin: if path != bin:
updateMachO(path, execPath, root) if path:
updateMachO(path, execPath, root)
if verbose: if verbose:
print('Updating Mach-O load from {} to {}...'.format(oldExecPath, newExecPath)) print('Updating Mach-O load from {} to {}...'.format(oldExecPath, newExecPath))
args.extend(['-change', oldExecPath, newExecPath]) args.extend(['-change', oldExecPath, newExecPath])