cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/3] cassandra git commit: cqlsh: Fix error when starting cqlsh with --debug
Date Wed, 09 Sep 2015 22:16:41 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 ec4b4d446 -> b2b756013


cqlsh: Fix error when starting cqlsh with --debug

Patch by Adam Holmberg; reviewed by Philip Thompson for CASSANDRA-10282


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

Branch: refs/heads/cassandra-2.2
Commit: acc08aeca4cc8bcee7948b9e3460a2679aec6247
Parents: 2106542
Author: Adam Holmberg <adam.holmberg@datastax.com>
Authored: Wed Sep 9 17:14:52 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Wed Sep 9 17:14:52 2015 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/acc08aec/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e3ad5e8..ba4347e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.10
+ * (cqlsh) Fix error when starting cqlsh with --debug (CASSANDRA-10282)
  * Scrub, Cleanup and Upgrade do not unmark compacting until all operations
    have completed, regardless of the occurence of exceptions (CASSANDRA-10274)
  * Fix handling of streaming EOF (CASSANDRA-10206)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/acc08aec/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 59496ce..b5f5281 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -2351,7 +2351,7 @@ def read_options(cmdlineargs, environment):
     try:
         options.connect_timeout = int(options.connect_timeout)
     except ValueError:
-        parser.error('{} is not a valid timeout.'.format(options.connect_timeout))
+        parser.error('"%s" is not a valid timeout.' % (options.connect_timeout,))
         options.connect_timeout = DEFAULT_CONNECT_TIMEOUT_SECONDS
 
     options.client_timeout = option_with_default(configs.get, 'connection', 'client_timeout',
'10')
@@ -2447,8 +2447,8 @@ def main(options, hostname, port):
             sys.exit("Can't open %r: %s" % (options.file, e))
 
     if options.debug:
-        sys.stderr.write("Using CQL driver: {}\n".format(cassandra))
-        sys.stderr.write("Using connect timeout: {} seconds\n".format(options.connect_timeout))
+        sys.stderr.write("Using CQL driver: %s\n" % (cassandra,))
+        sys.stderr.write("Using connect timeout: %s seconds\n" % (options.connect_timeout,))
 
     try:
         shell = Shell(hostname,


Mime
View raw message