diff --git a/CHANGES.txt b/CHANGES.txt index ab1b4ed4d1..72fe737d9e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,7 @@ Merged from 2.2: * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209) Merged from 2.1: + * (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) diff --git a/bin/cqlsh.py b/bin/cqlsh.py index c991cc7122..4fce833b05 100644 --- a/bin/cqlsh.py +++ b/bin/cqlsh.py @@ -2556,7 +2556,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') @@ -2651,8 +2651,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,