From 657043d4183cf5af122e7e1f921ad74d7f248760 Mon Sep 17 00:00:00 2001 From: Jonathan Hunter Date: Mon, 19 Feb 2018 07:38:37 +0000 Subject: [PATCH 1/2] Update help text for dbcheck Update the help text for dbcheck, to make its behaviour clear (in particular with reference to the difference between specifying "--yes" on the command line, and answering "yes"/"all" to each individual question) --- python/samba/netcmd/dbcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py index 2217366cc8d..28f951a5c79 100644 --- a/python/samba/netcmd/dbcheck.py +++ b/python/samba/netcmd/dbcheck.py @@ -61,7 +61,7 @@ def process_yes(option, opt, value, parser): Option("--fix", dest="fix", default=False, action='store_true', help='Fix any errors found'), Option("--yes", action='callback', callback=process_yes, - help="don't confirm changes, just do them all as a single transaction"), + help="don't confirm changes, applies all in a single transaction (requires all changes to succeed)"), Option("--cross-ncs", dest="cross_ncs", default=False, action='store_true', help="cross naming context boundaries"), Option("-v", "--verbose", dest="verbose", action="store_true", default=False, From 80d2a51d4aaf4b8856565be0994fd46d8d23d402 Mon Sep 17 00:00:00 2001 From: Jonathan Hunter Date: Mon, 19 Feb 2018 07:45:19 +0000 Subject: [PATCH 2/2] dbcheck - update wording Better wording for help text --- python/samba/netcmd/dbcheck.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py index 28f951a5c79..aec45d26824 100644 --- a/python/samba/netcmd/dbcheck.py +++ b/python/samba/netcmd/dbcheck.py @@ -61,7 +61,7 @@ def process_yes(option, opt, value, parser): Option("--fix", dest="fix", default=False, action='store_true', help='Fix any errors found'), Option("--yes", action='callback', callback=process_yes, - help="don't confirm changes, applies all in a single transaction (requires all changes to succeed)"), + help="don't confirm changes individually. Applies all as a single transaction (will not succeed if any errors are found)"), Option("--cross-ncs", dest="cross_ncs", default=False, action='store_true', help="cross naming context boundaries"), Option("-v", "--verbose", dest="verbose", action="store_true", default=False,