Merge pull request #1100 from RytoEX/fix-ci-osx

CI: Fix Mac builds on Travis CI's Xcode 8.3 image

CI/before-deploy-osx.sh

@@ -45,10 +45,10 @@ security create-keychain -p mysecretpassword build.keychain
 security default-keychain -s build.keychain
 security unlock-keychain -p mysecretpassword build.keychain
 security set-keychain-settings -t 3600 -u build.keychain
-security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain
-security list-keychains -s build.keychain
 hr "Importing certs into keychain"
 security import ./Certificates.p12 -k build.keychain -T /usr/bin/productsign -P ""
+# macOS 10.12+
+security set-key-partition-list -S apple-tool:,apple: -s -k mysecretpassword build.keychain
 hr "Signing Package"
 productsign --sign 2MMRE5MTB8 ./OBS.pkg ./$FILENAME
 

CI/install/osx/build_app.py

@@ -84,10 +84,9 @@ for i in candidate_paths:
 		for file_ in files:
 			path = root + "/" + file_
 			try:
-				out = check_output("{0}otool -L '{1}'".format(args.prefix, path),
-						stderr=subprocess.STDOUT, shell=True,
+				out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,
 						universal_newlines=True)
-				if "The file was not recognized as a valid object file" in out:
+				if "is not an object file" in out:
 					continue
 			except:
 				continue