You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/12/01 16:58:11 UTC
accumulo git commit: ACCUMULO-3373 Get thrift generation working
again.
Repository: accumulo
Updated Branches:
refs/heads/master 9be9576d9 -> 211197ce5
ACCUMULO-3373 Get thrift generation working again.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/211197ce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/211197ce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/211197ce
Branch: refs/heads/master
Commit: 211197ce590d802fb58d42d0204cc4db11c0ff03
Parents: 9be9576
Author: Josh Elser <el...@apache.org>
Authored: Mon Dec 1 10:57:54 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Mon Dec 1 10:57:54 2014 -0500
----------------------------------------------------------------------
core/src/main/scripts/generate-thrift.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/211197ce/core/src/main/scripts/generate-thrift.sh
----------------------------------------------------------------------
diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh
index 050001e..9779b91 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -41,8 +41,8 @@ fail() {
}
# Test to see if we have thrift installed
-VERSION=$(thrift -version 2>/dev/null | grep -F "${REQUIRED_THRIFT_VERSION}" | wc -l)
-if [[ $VERSION != 1 ]] ; then
+VERSION=$(thrift -version 2>/dev/null | grep -F "${REQUIRED_THRIFT_VERSION}" | wc -l | sed -e 's/^ *//' -e 's/ *$//')
+if [[ "${VERSION}" != '1' ]] ; then
# Nope: bail
echo "****************************************************"
echo "*** thrift is not available"