From 72db6c762fdead109a7dfbe0686331ecea932718 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Thu, 6 Jun 2013 20:08:02 +0000 Subject: mkadvisories: move config loading at the top --- mkadvisories | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mkadvisories b/mkadvisories index 0f767cb..3b207ca 100755 --- a/mkadvisories +++ b/mkadvisories @@ -14,6 +14,9 @@ my $config_file = '/usr/share/mga-advisories/config'; my $config = LoadFile($ENV{MGAADV_CONF} || $config_file); my $etc_config_file = '/etc/mga-advisories.conf'; my $etc_config = LoadFile($etc_config_file); +foreach my $k (keys %$etc_config) { + $config->{$k} = $etc_config->{$k}; +} my @report_logs; sub report_log { @@ -26,10 +29,6 @@ sub report_exit { exit 1; } -foreach my $k (keys %$etc_config) { - $config->{$k} = $etc_config->{$k}; -} - sub status_file { $config->{status_dir} . '/' . $_[0]; } -- cgit v1.2.1