diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-04-26 10:27:25 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-04-26 10:27:38 +0200 |
| commit | 8979f4569e0edaadf883819e2a830379bc1a46df (patch) | |
| tree | 6b0e48b4cf89207153bbe4c2f12e9d7204b531ea /contrib | |
| parent | 8254a8ae213bddae788e34d2b602513b8d0962f3 (diff) | |
| parent | e8babc4330cd7db82650f28147c388846a389c77 (diff) | |
Merge #10273: [scripts] Minor improvements to `macdeployqtplus` script.
e8babc4 Use `with` in `macdeployqtplus` script. (Chris Gavin)
4f3ac7d Remove unused variable from `macdeployqtplus` script. (Chris Gavin)
Tree-SHA512: 0259506b36f3bfcc64ada951dcd4fdab1611ef76a39f92effd1163b6d8fab06bdbf50784b4b22f8b1483697c3029c12cfee5372b442ab445887ac4f928f6de80
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/macdeploy/macdeployqtplus | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 5995f9f438..23a568ad13 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -302,7 +302,6 @@ def copyFramework(framework, path, verbose): if os.path.exists(fromContentsDir): toContentsDir = os.path.join(path, framework.destinationVersionContentsDirectory) shutil.copytree(fromContentsDir, toContentsDir, symlinks=True) - contentslinkfrom = os.path.join(path, framework.destinationContentsDirectory) if verbose >= 3: print("Copied Contents:", fromContentsDir) print(" to:", toContentsDir) @@ -675,9 +674,8 @@ else: if verbose >= 2: print("+ Installing qt.conf +") -f = open(os.path.join(applicationBundle.resourcesPath, "qt.conf"), "wb") -f.write(qt_conf.encode()) -f.close() +with open(os.path.join(applicationBundle.resourcesPath, "qt.conf"), "wb") as f: + f.write(qt_conf.encode()) # ------------------------------------------------ |