From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 7 Oct 2011 22:36:43 +0000 (+0200)
Subject: Bug 691845: importxml.pl complains if an open bug has the resolution field set to ''
X-Git-Tag: bugzilla-4.0.3~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17d0ccca05f3abfa304a12a2175dfafde837b76f;p=thirdparty%2Fbugzilla.git

Bug 691845: importxml.pl complains if an open bug has the resolution field set to ''
r=dkl a=LpSolit
---

diff --git a/importxml.pl b/importxml.pl
index c190663095..997773b4dc 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -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 );
     }