cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/3] git commit: cqlsh: fix crashing on Windows due to libedit detection
Date Sat, 27 Jul 2013 01:45:13 GMT
Updated Branches:
  refs/heads/trunk 2548e5aca -> 308afb20b


cqlsh: fix crashing on Windows due to libedit detection

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5812


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af4e1275
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af4e1275
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af4e1275

Branch: refs/heads/trunk
Commit: af4e1275edb7f76c460c4ea1d03fc525e2317fb4
Parents: 91cd653
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Jul 27 04:36:49 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Jul 27 04:36:49 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 bin/cqlsh   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/af4e1275/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fe28eee..955af7b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@
  * cqlsh: add collections support to COPY (CASSANDRA-5698)
  * retry important messages for any IOException (CASSANDRA-5804)
  * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626)
+ * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
 
 
 1.2.7

http://git-wip-us.apache.org/repos/asf/cassandra/blob/af4e1275/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 48cc492..4f49862 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -32,7 +32,7 @@ exit 1
 from __future__ import with_statement
 
 description = "CQL Shell for Apache Cassandra"
-version = "3.1.5"
+version = "3.1.6"
 
 from StringIO import StringIO
 from itertools import groupby
@@ -129,7 +129,7 @@ DEFAULT_TIME_FORMAT = '%Y-%m-%d %H:%M:%S%z'
 DEFAULT_FLOAT_PRECISION = 5
 DEFAULT_SELECT_LIMIT = 10000
 
-if readline is not None and 'libedit' in readline.__doc__:
+if readline is not None and readline.__doc__ is not None and 'libedit' in readline.__doc__:
     DEFAULT_COMPLETEKEY = '\t'
 else:
     DEFAULT_COMPLETEKEY = 'tab'


Mime
View raw message