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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit b3e6e4b542b6b595f65219a4302f7ab1829218c5
Author: Mihai Moldovan <io...@ionic.de>
Date:   Thu Sep 24 03:39:26 2015 +0200

    deduplicate.sh: fix wrong return value capture.
    
    We want to check the return value of the executed function/command, not
    that of "typeset".
---
 debian/changelog |    2 ++
 deduplicate.sh   |    8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbb62bc..42b0751 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -151,6 +151,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       lazy_canonical_path.
     - deduplicate.sh: remove a bit of noisy debug output, but turn on
       parse_otool_output debugging.
+    - deduplicate.sh: fix wrong return value capture. We want to check the
+      return value of the executed function/command, not that of "typeset".
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/deduplicate.sh b/deduplicate.sh
index e357529..98f0b26 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -170,8 +170,12 @@ done
 for all_entry in "${all_files[@]}"; do
        typeset otool_out="$(otool -L "${all_entry}")"
 
-       typeset dependencies="$(parse_otool_output "${otool_out}")"
-       echo "parse_otool_output return value: ${?}"
+       # Don't merge the declaration and initialization with the real value 
assignment.
+       # We need the return value of parse_otool_output(), but running
+       # typeset foo="$(bar)" will give us the return value of typeset, not 
bar().
+       typeset dependencies=""
+       dependencies="$(parse_otool_output "${otool_out}")"
+
        if [ "${?}" -eq "0" ]; then
                typeset line=""
                while read -r line; do

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to