fuxino/simple_backup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix parsing of old config file

Browse Source
This commit is contained in:
daniele 2023-06-15 09:30:59 +02:00
parent d1b429d37a
commit f37cd89b4e
Signed by: fuxino
GPG Key ID: 981A2B2A3BBF5514
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
simple_backup/simple_backup.py
View File

@ -533,15 +533,23 @@ def _read_config(config_file):
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read(config_file) config.read(config_file)
inputs = config.get('backup', 'inputs') section = 'backup'
# Allow compatibility with previous version of config file
try:
inputs = config.get(section, 'inputs')
except configparser.NoSectionError:
section = 'default'
inputs = config.get(section, 'inputs')
inputs = inputs.split(',') inputs = inputs.split(',')
inputs = _expand_inputs(inputs) inputs = _expand_inputs(inputs)
inputs = list(set(inputs)) inputs = list(set(inputs))
output = config.get('backup', 'backup_dir') output = config.get(section, 'backup_dir')
output = os.path.expanduser(output.replace('~', f'~{user}')) output = os.path.expanduser(output.replace('~', f'~{user}'))
exclude = config.get('backup', 'exclude') exclude = config.get(section, 'exclude')
exclude = exclude.split(',') exclude = exclude.split(',')
keep = config.getint('backup', 'keep') keep = config.getint(section, 'keep')
try: try:
host = config.get('server', 'host') host = config.get('server', 'host')
@ -587,7 +595,11 @@ def simple_backup():
except NameError: except NameError:
pass pass
inputs, output, exclude, keep, host, username, ssh_keyfile = _read_config(args.config) try:
inputs, output, exclude, keep, host, username, ssh_keyfile = _read_config(args.config)
except (configparser.NoSectionError, configparser.NoOptionError):
logger.critical('Bad configuration file')
sys.exit(1)
if args.input is not None: if args.input is not None:
inputs = args.input inputs = args.input