psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Log a warning when "borgmatic borg" is run with an action that borgmatic natively supports (#694).

Browse source
This commit is contained in:
Dan Helfman 2023-05-14 09:59:28 -07:00
parent 403ae0f698
commit 8eb05b840a
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -18,7 +18,7 @@
--editable" development installs. --editable" development installs.
* #691: Fix error in "borgmatic restore" action when the configured repository path is relative * #691: Fix error in "borgmatic restore" action when the configured repository path is relative
instead of absolute. instead of absolute.
* Run "borgmatic borg" action without capturing output so interactive prompts and flags like * #694: Run "borgmatic borg" action without capturing output so interactive prompts and flags like
"--progress" still work. "--progress" still work.
1.7.12 1.7.12

9
borgmatic/borg/borg.py
View file

@ -1,5 +1,6 @@
import logging import logging
import borgmatic.commands.arguments
import borgmatic.logger import borgmatic.logger
from borgmatic.borg import environment, flags from borgmatic.borg import environment, flags
from borgmatic.execute import DO_NOT_CAPTURE, execute_command from borgmatic.execute import DO_NOT_CAPTURE, execute_command
@ -36,6 +37,14 @@ def run_arbitrary_borg(
command_options_start_index = 2 if options[0] in BORG_SUBCOMMANDS_WITH_SUBCOMMANDS else 1 command_options_start_index = 2 if options[0] in BORG_SUBCOMMANDS_WITH_SUBCOMMANDS else 1
borg_command = tuple(options[:command_options_start_index]) borg_command = tuple(options[:command_options_start_index])
command_options = tuple(options[command_options_start_index:]) command_options = tuple(options[command_options_start_index:])
if (
borg_command
and borg_command[0] in borgmatic.commands.arguments.SUBPARSER_ALIASES.keys()
):
logger.warning(
f"Borg's {borg_command[0]} subcommand is supported natively by borgmatic. Try this instead: borgmatic {borg_command[0]}"
)
except IndexError: except IndexError:
borg_command = () borg_command = ()
command_options = () command_options = ()