sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-24 02:04:21 +03:00
Code

utils: Inline defaults and help strings

Browse Source 
Removes an unnecessary level of indirection: defaults and help strings
are now where they are expected.  Also removes some global variables.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jose A. Rivera <jarrpa@samba.org>
This commit is contained in:
Martin Schwenke 2021-04-27 14:50:15 +10:00 committed by Martin Schwenke
parent af5aecced1
commit e323d16a9d
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ctdb/utils/etcd/ctdb_etcd_lock
View File

@ -62,19 +62,6 @@ import etcd
# Globals ---------------------------------------------------------------------
#
defaults = {'config': os.path.join(
os.getenv('CTDB_BASE', '/usr/local/etc/ctdb'),
'etcd'),
'verbose': 0,
}
helpmsg = {'config': 'Configuration file to use. The default behavior ' +
'is to look is the base CTDB configuration '
+ 'directory, which can be overwritten by setting the'
+ 'CTDB_BASE environment variable, for a file called'
+ '\'etcd\'. Default value is ' + defaults['config'],
'verbose': 'Display verbose output to stderr. Default is no output.',
}
log_levels = {0: logging.ERROR,
1: logging.WARNING,
2: logging.DEBUG,
@ -93,13 +80,20 @@ def process_args():
formatter_class=argparse.RawDescriptionHelpFormatter)
parser.add_argument('-v', '--verbose',
action='count',
help=helpmsg['verbose'],
default=defaults['verbose'],
help='Display verbose output to stderr. '
'Default is no output.',
default=0,
)
parser.add_argument('-c', '--config',
action='store',
help=helpmsg['config'],
default=defaults['config'],
help='Configuration file to use. The default behavior '
'is to look is the base CTDB configuration '
'directory, which can be overwritten by setting '
'the CTDB_BASE environment variable, for a file '
'called \'etcd\'. Default value is %(default)s.',
default=os.path.join(os.getenv('CTDB_BASE',
'/usr/local/etc/ctdb'),
'etcd'),
)
args = parser.parse_args()