diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/MGA/Advisories.pm | 33 | ||||
| -rwxr-xr-x | mgaadv | 1 |
3 files changed, 35 insertions, 0 deletions
@@ -1,3 +1,4 @@ +- close bugs automatically when processing advisories - perform some cross checks on bugzilla when publishing advisories Version 0.17 diff --git a/lib/MGA/Advisories.pm b/lib/MGA/Advisories.pm index 62f9bee..7058d3b 100644 --- a/lib/MGA/Advisories.pm +++ b/lib/MGA/Advisories.pm @@ -477,6 +477,39 @@ sub send_adv_mail { } } +sub close_bugs { + my ($advdb) = @_; + return unless $config->{mode} eq 'site'; + + if (!init_bz()) { + report_log("Cannot close advisory bugs. Could not initialise bugzilla"); + return; + } + foreach my $adv (keys %{$advdb->{advisories}}) { + next if $advdb->{advisories}{$adv}{status}{bug_closed}; + + my $bugnum = 0; + if (scalar($advdb->{advisories}{$adv}{references}) > 0) { + ($bugnum) = $advdb->{advisories}{$adv}{references}[0] =~ m/$config->{bugzilla_url}.*=([0-9]+)$/g; + } + if (!$bugnum) { + report_log("Could not extract bug number for $adv"); + next; + } + + my $advurl = $config->{site_url} . '/' . $adv . '.html'; + my $comment = "An update for this issue has been pushed to Mageia Updates repository.\n\n$advurl"; + + if (my $result = call_bz('Bug.update', { ids => [$bugnum], status => 'RESOLVED', resolution => 'FIXED', comment => { body => $comment } })) { + report_log("Bug $bugnum closed for $adv"); + $advdb->{advisories}{$adv}{status}{bug_closed} = time(); + save_status($advdb, $adv); + } else { + report_log("Could not close bug $bugnum for $adv"); + } + } +} + sub send_report { my ($advdb) = @_; return unless @report_logs; @@ -157,6 +157,7 @@ sub process { MGA::Advisories::output_pages(\%advdb); MGA::Advisories::dumpdb(\%advdb); MGA::Advisories::send_adv_mail(\%advdb); + MGA::Advisories::close_bugs(\%advdb); MGA::Advisories::send_report(\%advdb); } |