natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ninja: expand user paths for cqlsh.py as part of CASSANDRA-17448 

patch by Stefan Miklosovic; reviewed by Brandon Williams for CASSANDRA-17448
This commit is contained in:
Stefan Miklosovic 2022-03-25 21:37:45 +01:00
parent dc521cca43
commit cd5f215c72
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/cqlsh.py
View File

@ -249,10 +249,10 @@ try:
except OSError:
print('\nWarning: Cannot create directory at `%s`. Command history will not be saved. Please check what was the environment property CQL_HISTORY set to.\n' % HISTORY_DIR)
DEFAULT_CQLSHRC = os.path.join('~', '.cassandra', 'cqlshrc')
DEFAULT_CQLSHRC = os.path.expanduser(os.path.join('~', '.cassandra', 'cqlshrc'))
if hasattr(options, 'cqlshrc'):
CONFIG_FILE = options.cqlshrc
CONFIG_FILE = os.path.expanduser(options.cqlshrc)
if not os.path.exists(CONFIG_FILE):
print('\nWarning: Specified cqlshrc location `%s` does not exist. Using `%s` instead.\n' % (CONFIG_FILE, DEFAULT_CQLSHRC))
CONFIG_FILE = DEFAULT_CQLSHRC