From ee5dbd9f82c768df23afbd5262b58496a2ec8d78 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 3 Feb 2017 09:37:28 -0800 Subject: [PATCH] Tools: Fix recurring multiple times over the same library --- CHANGES | 1 + tools/deploy-mac.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index d563172c1..dafa39d3c 100644 --- a/CHANGES +++ b/CHANGES @@ -22,6 +22,7 @@ Bugfixes: - Qt: Fix timing issues on high refresh rate monitors - GBA Savedata: Fix savedata unmasking (fixes mgba.io/i/441) - Util: Fix overflow when loading invalid UPS patches + - Tools: Fix recurring multiple times over the same library Misc: - SDL: Remove scancode key input - GBA Video: Clean up unused timers diff --git a/tools/deploy-mac.py b/tools/deploy-mac.py index 8305a4304..e525e3012 100755 --- a/tools/deploy-mac.py +++ b/tools/deploy-mac.py @@ -96,6 +96,7 @@ def updateMachO(bin, execPath, root): if os.access(newPath, os.F_OK): if verbose: print('Skipping copying {}, already done.'.format(oldPath)) + newPath = None elif os.path.abspath(oldPath) != os.path.abspath(newPath): if verbose: print('Copying {} to {}...'.format(oldPath, newPath)) @@ -111,7 +112,8 @@ def updateMachO(bin, execPath, root): args = [installNameTool] for path, oldExecPath, newExecPath in toUpdate: if path != bin: - updateMachO(path, execPath, root) + if path: + updateMachO(path, execPath, root) if verbose: print('Updating Mach-O load from {} to {}...'.format(oldExecPath, newExecPath)) args.extend(['-change', oldExecPath, newExecPath])