diff options
| author |  Unit 193 <unit193@ubuntu.com> | 2019-07-13 19:08:31 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2019-07-13 23:09:21 -0400 |
| commit | 4b168e80f105e7d93f19a5cbd691593eb1f95778 (patch) | |
| tree | ac96d07e1bd6e822df62b2051bcc64d32bf8d417 | |
| parent | dc4416da24b9852c32a962743fc009381af3d466 (diff) | |
| download | mini-dinstall-4b168e80f105e7d93f19a5cbd691593eb1f95778.tar.bz2 mini-dinstall-4b168e80f105e7d93f19a5cbd691593eb1f95778.tar.xz mini-dinstall-4b168e80f105e7d93f19a5cbd691593eb1f95778.tar.zst | |
Archive directory on command line should take precedence over config.
Closes: #496231
| -rwxr-xr-x | mini-dinstall | 6 |
1 files 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) |