Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 691845: importxml.pl complains if an open bug has the resolution field set to ''

Browse Source 
r=dkl a=LpSolit


git-svn-id: svn://10.0.0.236/branches/BUGZILLA-4_0-BRANCH@262970 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org 2011-10-07 22:47:30 +00:00
parent d784f25d96
commit ace3e156bf
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
7650
7651

15
mozilla/webtools/bugzilla/importxml.pl
View File

@ -876,8 +876,6 @@ sub process_bug {
}
# Status & Resolution
my $has_res = defined($bug_fields{'resolution'});
my $has_status = defined($bug_fields{'bug_status'});
my $valid_res = check_field('resolution',
scalar $bug_fields{'resolution'},
undef, ERR_LEVEL );
@ -932,10 +930,10 @@ sub process_bug {
}
}
if($has_status){
if ($status) {
if($valid_status){
if($is_open){
if($has_res){
if ($resolution) {
$err .= "Resolution set on an open status.\n";
$err .= " Dropping resolution $resolution\n";
$resolution = undef;
@ -969,7 +967,7 @@ sub process_bug {
}
}
else{ # $is_open is false
if(!$has_res){
if (!$resolution) {
$err .= "Missing Resolution. Setting status to ";
if($everconfirmed){
$status = $initial_status;
@ -999,9 +997,8 @@ sub process_bug {
$err .= $bug_fields{'bug_status'} . "\".\n";
$resolution = undef;
}
}
else{ #has_status is false
else {
if($everconfirmed){
$status = $initial_status;
}
@ -1012,8 +1009,8 @@ sub process_bug {
$err .= " Previous status was unknown\n";
$resolution = undef;
}
if (defined $resolution){
if ($resolution) {
push( @query, "resolution" );
push( @values, $resolution );
}