From 4b168e80f105e7d93f19a5cbd691593eb1f95778 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sat, 13 Jul 2019 19:08:31 -0400 Subject: Archive directory on command line should take precedence over config. Closes: #496231 --- mini-dinstall | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mini-dinstall b/mini-dinstall index 27039af..f9d8ec1 100755 --- a/mini-dinstall +++ b/mini-dinstall @@ -240,10 +240,10 @@ if not (configp.has_option('DEFAULT', 'mail_log_level') and configp.get('DEFAULT mail_handler.setLevel(mail_log_level) logger.addHandler(mail_handler) -if configp.has_option('DEFAULT', 'archivedir'): - toplevel_directory = os.path.expanduser(configp.get('DEFAULT', 'archivedir')) -elif args: +if args: toplevel_directory = args[0] +elif configp.has_option('DEFAULT', 'archivedir'): + toplevel_directory = os.path.expanduser(configp.get('DEFAULT', 'archivedir')) else: logger.error("No archivedir specified on command line or in config files.") sys.exit(1) -- cgit v1.2.3