This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit e776381c6a4ddf9066d900c6758065f25cb0b397
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Aug 27 04:53:44 2015 +0200
deduplicate.sh: fix parse_otool_output: we want to return failure only iff
any of the strings are present in otool's output and actually handle the
failure string *ARRAY* correctly as that.
---
debian/changelog | 3 +++
deduplicate.sh | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d874eb3..95db9bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,6 +147,9 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
"sparse" arrays correctly.
- deduplicate.sh: quote "${arr[@]}" correctly to not suddenly force word
splitting.
+ - deduplicate.sh: fix parse_otool_output: we want to return failure only
+ iff any of the strings are present in otool's output and actually handle
+ the failure string *ARRAY* correctly as that.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-...@lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index 33c4628..939eb55 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -15,9 +15,9 @@ parse_otool_output() {
typeset raw_output="${@}"
typeset fail_str=""
- for fail_str in ${otool_fail_str}; do
- if ! echo "${raw_output}" | grep -q "${fail_str}"; then
- exit 1
+ for fail_str in "${otool_fail_str[@]}"; do
+ if echo "${raw_output}" | grep -q "${fail_str}"; then
+ return 1
fi
done
--
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
