Merging upstream version 1.13.2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
4e93acdb1a
commit
fe812793aa
6 changed files with 146 additions and 30 deletions
|
@ -472,6 +472,7 @@ class LiteCli(object):
|
|||
result_count += 1
|
||||
mutating = mutating or is_mutating(status)
|
||||
special.unset_once_if_written()
|
||||
special.unset_pipe_once_if_written()
|
||||
except EOFError as e:
|
||||
raise e
|
||||
except KeyboardInterrupt:
|
||||
|
@ -658,6 +659,7 @@ class LiteCli(object):
|
|||
self.log_output(line)
|
||||
special.write_tee(line)
|
||||
special.write_once(line)
|
||||
special.write_pipe_once(line)
|
||||
|
||||
if fits or output_via_pager:
|
||||
# buffering
|
||||
|
@ -824,7 +826,7 @@ class LiteCli(object):
|
|||
|
||||
|
||||
@click.command()
|
||||
@click.option("-V", "--version", is_flag=True, help="Output litecli's version.")
|
||||
@click.version_option(__version__, "-V", "--version")
|
||||
@click.option("-D", "--database", "dbname", help="Database to use.")
|
||||
@click.option(
|
||||
"-R",
|
||||
|
@ -857,7 +859,6 @@ class LiteCli(object):
|
|||
def cli(
|
||||
database,
|
||||
dbname,
|
||||
version,
|
||||
prompt,
|
||||
logfile,
|
||||
auto_vertical_output,
|
||||
|
@ -874,11 +875,6 @@ def cli(
|
|||
- litecli lite_database
|
||||
|
||||
"""
|
||||
|
||||
if version:
|
||||
print("Version:", __version__)
|
||||
sys.exit(0)
|
||||
|
||||
litecli = LiteCli(
|
||||
prompt=prompt,
|
||||
logfile=logfile,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue