[Pkg-owncloud-commits] [owncloud-client] 138/171: OS X: Fix macdeployqt not to embed symlinks when ran multiple times

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 509224308075eedd2b988d52af92f85e32d3cb54
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Fri Jan 22 18:03:18 2016 +0100

    OS X: Fix macdeployqt not to embed symlinks when ran multiple times
    
    ln has a special syntax to create the symlink inside the last path if it's
    a directory (or a symlink to a directory).
    
    Also pass --strict to codesign --verify to catch this kind of error.
---
 admin/osx/macdeployqt.py | 3 +++
 admin/osx/sign_app.sh    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py
index 8c60022..25bfaeb 100755
--- a/admin/osx/macdeployqt.py
+++ b/admin/osx/macdeployqt.py
@@ -261,6 +261,9 @@ def CopyFramework(source_dylib):
       dest_path = os.path.join(frameworks_dir, framework)
       dest_dylib_path = os.path.join(frameworks_dir, *parts[i:-1])
       break
+  if os.path.exists(dest_path):
+    print dest_path, "already exists, skipping..."
+    return
 
   args = ['mkdir', '-p', dest_dylib_path]
   commands.append(args)
diff --git a/admin/osx/sign_app.sh b/admin/osx/sign_app.sh
index e495fe1..355b8d2 100755
--- a/admin/osx/sign_app.sh
+++ b/admin/osx/sign_app.sh
@@ -10,7 +10,7 @@ codesign -s "$identity" --force --preserve-metadata=entitlements --verbose=4 --d
 
 # Verify the signature
 codesign -dv $src_app
-codesign --verify -v $src_app
+codesign --verify -v --strict $src_app
 spctl -a -t exec -vv $src_app
 
 # Validate that the key used for signing the binary matches the expected TeamIdentifier

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git