severity => [qw(set_severity)],
affects => [qw(affects)],
summary => [qw(summary)],
+ outlook => [qw(outlook)],
owner => [qw(owner)],
title => [qw(set_title)],
forward => [qw(set_forwarded)],
}
use Debbugs::Config qw(:config);
-use Debbugs::Common qw(:lock buglog :misc get_hashname sort_versions :utf8);
+use Debbugs::Common qw(:lock buglog :misc get_hashname sort_versions);
+use Debbugs::UTF8;
use Debbugs::Status qw(bug_archiveable :read :hook writebug new_bug splitpackages split_status_fields get_bug_status);
use Debbugs::CGI qw(html_escape);
use Debbugs::Log qw(:misc :write);
use Debbugs::Text qw(:templates);
-use Debbugs::Mail qw(rfc822_date send_mail_message default_headers);
+use Debbugs::Mail qw(rfc822_date send_mail_message default_headers encode_headers);
use Debbugs::MIME qw(create_mime_message);
use Mail::RFC822::Address qw();
if (not @svers) {
@svers = $version;
}
- else {
+ elsif (not grep {$version eq $_} @svers) {
+ # The $version was not equal to one of the source
+ # versions, so it's probably unqualified (or just
+ # wrong). Delete it, and use the source versions
+ # instead.
if (exists $found_versions{$version}) {
delete $found_versions{$version};
$found_removed{$version} = 1;
}
# if the found we are adding matches any fixed
# versions, remove them
- my @temp = grep m{(^|/)\Q$sver\E}, keys %fixed_versions;
+ my @temp = grep m{(^|/)\Q$sver\E$}, keys %fixed_versions;
delete $fixed_versions{$_} for @temp;
$fixed_removed{$_} = 1 for @temp;
}
# in the case of removal, we only concern ourself with
# the version passed, not the source version it maps
# to
- my @temp = grep m{(^|/)\Q$version\E}, keys %found_versions;
+ my @temp = grep m{(?:^|/)\Q$version\E$}, keys %found_versions;
delete $found_versions{$_} for @temp;
$found_removed{$_} = 1 for @temp;
}
$locks--;
}
__end_control(%info);
- for my $change (values %{$changes}, @{$disallowed_changes}) {
+ for my $change ((map {@{$_}} values %{$changes}), @{$disallowed_changes}) {
print {$transcript} "$change->{field} of #$change->{bug} is '$change->{text_orig_value}' not '$change->{text_value}'\n";
}
die "Unable to modify bugs so they could be merged";
# look like. However, if merge is set, tags, fixed and found
# are merged.
if ($data->{bug_num} == $master_bug) {
- for (qw(package forwarded severity blocks blockedby done owner summary affects)) {
+ for (qw(package forwarded severity blocks blockedby done owner summary outlook affects)) {
$merge_status{$_} = $data->{$_}
}
}
@{$merge_status{"${_}_versions"}}{@{$data->{"${_}_versions"}}} = (1) x @{$data->{"${_}_versions"}};
}
}
+ # if there is a non-source qualified version with a corresponding
+ # source qualified version, we only want to merge the source
+ # qualified version(s)
+ for (qw(fixed found)) {
+ my @unqualified_versions = grep {m{/}?0:1} keys %{$merge_status{"${_}_versions"}};
+ for my $unqualified_version (@unqualified_versions) {
+ if (grep {m{/\Q$unqualified_version\E}} keys %{$merge_status{"${_}_versions"}}) {
+ delete $merge_status{"${_}_versions"}{$unqualified_version};
+ }
+ }
+ }
return (\%merge_status,$bugs_to_merge);
}
key => 'summary',
options => [],
},
+ outlook => {func => \&outlook,
+ key => 'outlook',
+ options => [],
+ },
affects => {func => \&affects,
key => 'package',
options => [],
allowed => 1,
},
);
- for my $field (qw(forwarded severity blocks blockedby done owner summary affects package fixed_versions found_versions keywords)) {
+ for my $field (qw(forwarded severity blocks blockedby done owner summary outlook affects package fixed_versions found_versions keywords)) {
# if the ideal bug already has the field set properly, we
# continue on.
if ($field eq 'keywords'){
sub summary {
- my %param = validate_with(params => \@_,
+ # outlook and summary are exactly the same, basically
+ return _summary('summary',@_);
+}
+
+=head1 OUTLOOK FUNCTIONS
+
+=head2 outlook
+
+ eval {
+ outlook(bug => $ref,
+ transcript => $transcript,
+ ($dl > 0 ? (debug => $transcript):()),
+ requester => $header{from},
+ request_addr => $controlrequestaddr,
+ message => \@log,
+ affected_packages => \%affected_packages,
+ recipients => \%recipients,
+ outlook => undef,
+ );
+ };
+ if ($@) {
+ $errors++;
+ print {$transcript} "Failed to mark $ref with outlook foo: $@";
+ }
+
+Handles all setting of outlook fields
+
+If outlook is undef, unsets the outlook
+
+If outlook is 0, sets the outlook to the first paragraph contained in
+the message passed.
+
+If outlook is a positive integer, sets the outlook to the message specified.
+
+Otherwise, sets outlook to the value passed.
+
+=cut
+
+
+sub outlook {
+ return _summary('outlook',@_);
+}
+
+sub _summary {
+ my ($cmd,@params) = @_;
+ my %param = validate_with(params => \@params,
spec => {bug => {type => SCALAR,
regex => qr/^\d+$/,
},
# specific options here
- summary => {type => SCALAR|UNDEF,
- default => 0,
- },
+ $cmd , {type => SCALAR|UNDEF,
+ default => 0,
+ },
%common_options,
%append_action_options,
},
);
-# croak "summary must be numeric or undef" if
-# defined $param{summary} and not $param{summary} =~ /^\d+/;
my %info =
__begin_control(%param,
- command => 'summary'
+ command => $cmd,
);
my ($debug,$transcript) =
@info{qw(debug transcript)};
my $summary = '';
my $summary_msg = '';
my $action = '';
- if (not defined $param{summary}) {
+ if (not defined $param{$cmd}) {
# do nothing
- print {$debug} "Removing summary fields\n";
- $action = 'Removed summary';
+ print {$debug} "Removing $cmd fields\n";
+ $action = "Removed $cmd";
}
- elsif ($param{summary} =~ /^\d+$/) {
+ elsif ($param{$cmd} =~ /^\d+$/) {
my $log = [];
my @records = Debbugs::Log::read_log_records(bug_num => $param{bug});
- if ($param{summary} == 0) {
+ if ($param{$cmd} == 0) {
$log = $param{message};
$summary_msg = @records + 1;
}
else {
- if (($param{summary} - 1 ) > $#records) {
- die "Message number '$param{summary}' exceeds the maximum message '$#records'";
+ if (($param{$cmd} - 1 ) > $#records) {
+ die "Message number '$param{$cmd}' exceeds the maximum message '$#records'";
}
- my $record = $records[($param{summary} - 1 )];
+ my $record = $records[($param{$cmd} - 1 )];
if ($record->{type} !~ /incoming-recv|recips/) {
- die "Message number '$param{summary}' is a invalid message type '$record->{type}'";
+ die "Message number '$param{$cmd}' is a invalid message type '$record->{type}'";
}
- $summary_msg = $param{summary};
+ $summary_msg = $param{$cmd};
$log = [$record->{text}];
}
my $p_o = Debbugs::MIME::parse(join('',@{$log}));
next if $in_pseudoheaders;
$paragraph .= $line ." \n";
}
- print {$debug} "Summary is going to be '$paragraph'\n";
+ print {$debug} ucfirst($cmd)." is going to be '$paragraph'\n";
$summary = $paragraph;
$summary =~ s/[\n\r]/ /g;
if (not length $summary) {
- die "Unable to find summary message to use";
+ die "Unable to find $cmd message to use";
}
# trim off a trailing spaces
$summary =~ s/\ *$//;
}
else {
- $summary = $param{summary};
+ $summary = $param{$cmd};
}
for my $data (@data) {
- print {$debug} "Going to change summary\n";
+ print {$debug} "Going to change $cmd\n";
if (((not defined $summary or not length $summary) and
- (not defined $data->{summary} or not length $data->{summary})) or
- $summary eq $data->{summary}) {
- print {$transcript} "Ignoring request to change the summary of bug $param{bug} to the same value\n";
+ (not defined $data->{$cmd} or not length $data->{$cmd})) or
+ $summary eq $data->{$cmd}) {
+ print {$transcript} "Ignoring request to change the $cmd of bug $param{bug} to the same value\n";
next;
}
if (length $summary) {
- if (length $data->{summary}) {
- $action = "Summary replaced with message bug $param{bug} message $summary_msg";
+ if (length $data->{$cmd}) {
+ $action = ucfirst($cmd)." replaced with message bug $param{bug} message $summary_msg";
}
else {
- $action = "Summary recorded from message bug $param{bug} message $summary_msg";
+ $action = ucfirst($cmd)." recorded from message bug $param{bug} message $summary_msg";
}
}
my $old_data = dclone($data);
- $data->{summary} = $summary;
+ $data->{$cmd} = $summary;
append_action_to_log(bug => $data->{bug_num},
- command => 'summary',
+ command => $cmd,
old_data => $old_data,
new_data => $data,
get_lock => 0,
}
my $msg = join('',
(exists $param{command} ?
- "<!-- command:".html_escape(encode_utf8($param{command}))." -->\n":""
+ "<!-- command:".html_escape(encode_utf8_safely($param{command}))." -->\n":""
),
(length $param{requester} ?
- "<!-- requester: ".html_escape(encode_utf8($param{requester}))." -->\n":""
+ "<!-- requester: ".html_escape(encode_utf8_safely($param{requester}))." -->\n":""
),
(length $param{request_addr} ?
- "<!-- request_addr: ".html_escape(encode_utf8($param{request_addr}))." -->\n":""
+ "<!-- request_addr: ".html_escape(encode_utf8_safely($param{request_addr}))." -->\n":""
),
"<!-- time:".time()." -->\n",
$data_diff,
- "<strong>".html_escape(encode_utf8($param{action}))."</strong>\n");
+ "<strong>".html_escape(encode_utf8_safely($param{action}))."</strong>\n");
if (length $param{requester}) {
- $msg .= "Request was from <code>".html_escape(encode_utf8($param{requester}))."</code>\n";
+ $msg .= "Request was from <code>".html_escape(encode_utf8_safely($param{requester}))."</code>\n";
}
if (length $param{request_addr}) {
- $msg .= "to <code>".html_escape(encode_utf8($param{request_addr}))."</code>";
+ $msg .= "to <code>".html_escape(encode_utf8_safely($param{request_addr}))."</code>";
}
if (length $param{desc}) {
- $msg .= ":<br>\n".encode_utf8($param{desc})."\n";
+ $msg .= ":<br>\n".encode_utf8_safely($param{desc})."\n";
}
else {
$msg .= ".\n";
}
if (not exists $param{message}) {
my $date = rfc822_date();
- $param{message} = fill_in_template(template => 'mail/fake_control_message',
- variables => {request_addr => $param{request_addr},
- requester => $param{requester},
- date => $date,
- action => $action
- },
- );
+ $param{message} =
+ encode_headers(fill_in_template(template => 'mail/fake_control_message',
+ variables => {request_addr => $param{request_addr},
+ requester => $param{requester},
+ date => $date,
+ action => $action
+ },
+ ));
}
if (not defined $action) {
carp "Undefined action!";
sub check_limit{
my %param = validate_with(params => \@_,
- spec => {data => {type => ARRAYREF|SCALAR,
+ spec => {data => {type => ARRAYREF|HASHREF,
},
limit => {type => HASHREF|UNDEF,
},