From 35309d13d04178452f8a0b897f9cacb7b106a7b8 Mon Sep 17 00:00:00 2001 From: anyushevai Date: Sun, 21 Oct 2018 23:55:47 +0300 Subject: [PATCH] add warning & abort if tljh-config is called as non-root user --- tljh/config.py | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/tljh/config.py b/tljh/config.py index a09bda1..69b1c97 100644 --- a/tljh/config.py +++ b/tljh/config.py @@ -223,7 +223,11 @@ def main(argv=None): argv = sys.argv[1:] from .log import init_logging - init_logging() + try: + init_logging() + except Exception as e: + print(str(e)) + print("Perhaps you didn't use `sudo -E`?") argparser = argparse.ArgumentParser() argparser.add_argument( @@ -291,18 +295,22 @@ def main(argv=None): args = argparser.parse_args(argv) - if args.action == 'show': - show_config(args.config_path) - elif args.action == 'set': - set_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'add-item': - add_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'remove-item': - remove_config_value(args.config_path, args.key_path, parse_value(args.value)) - elif args.action == 'reload': - reload_component(args.component) - else: - argparser.print_help() + try: + if args.action == 'show': + show_config(args.config_path) + elif args.action == 'set': + set_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'add-item': + add_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'remove-item': + remove_config_value(args.config_path, args.key_path, parse_value(args.value)) + elif args.action == 'reload': + reload_component(args.component) + else: + argparser.print_help() + except Exception as e: + print(str(e)) + print("Perhaps you didn't use `sudo -E`?") if __name__ == '__main__':