Improve handling of user detection failure

This commit is contained in:
daniele 2025-03-30 14:37:30 +02:00
parent eb889beee7
commit 9fdb959540
Signed by: fuxino
GPG Key ID: 981A2B2A3BBF5514

View File

@ -679,7 +679,10 @@ def _read_config(config_file, user=None):
'numeric_ids': False} 'numeric_ids': False}
if not os.path.isfile(config_file): if not os.path.isfile(config_file):
logger.warning('Config file %s does not exist', config_file) if user is not None:
logger.warning('Config file %s does not exist', config_file)
else:
logger.warning('User not specified. Can\'t read configuration file')
return config_args return config_args
@ -793,7 +796,12 @@ def simple_backup():
if euid == 0: if euid == 0:
user = os.getenv('SUDO_USER') user = os.getenv('SUDO_USER')
homedir = os.path.expanduser(f'~{user}')
if user is not None:
homedir = os.path.expanduser(f'~{user}')
else:
logger.warning('Failed to detect user. You can use -u/--user parameter to manually specify it')
homedir = None
else: else:
user = os.getenv('USER') user = os.getenv('USER')
homedir = os.getenv('HOME') homedir = os.getenv('HOME')