Bug 348282: importxml.pl throws Bugzilla::Bug::ValidateTime warnings if the time...

diff --git a/importxml.pl b/importxml.pl
index 233253d3fd8d9b4da2a616b8e970e7035129b465..53478b0e3df0e827f874179c8c6b3dd900facb06 100755 (executable)
--- a/importxml.pl
+++ b/importxml.pl
@@ -830,26 +830,36 @@ sub process_bug {
           || undef;
         push( @values, $date );
         push( @query,  "deadline" );
-        eval {
-            Bugzilla::Bug::ValidateTime($bug_fields{'estimated_time'}, "e");
-        };
-        if (!$@){
-            push( @values, $bug_fields{'estimated_time'} );
-            push( @query,  "estimated_time" );
+        if ( defined $bug_fields{'estimated_time'} ) {
+            eval {
+                Bugzilla::Bug::ValidateTime($bug_fields{'estimated_time'}, "e");
+            };
+            if (!$@){
+                push( @values, $bug_fields{'estimated_time'} );
+                push( @query,  "estimated_time" );
+            }
         }
-        eval {
-            Bugzilla::Bug::ValidateTime($bug_fields{'remaining_time'}, "r");
-        };
-        if (!$@){
-            push( @values, $bug_fields{'remaining_time'} );
-            push( @query,  "remaining_time" );
+        if ( defined $bug_fields{'remaining_time'} ) {
+            eval {
+                Bugzilla::Bug::ValidateTime($bug_fields{'remaining_time'}, "r");
+            };
+            if (!$@){
+                push( @values, $bug_fields{'remaining_time'} );
+                push( @query,  "remaining_time" );
+            }
         }
-        eval {
-            Bugzilla::Bug::ValidateTime($bug_fields{'actual_time'}, "a");
-        };
-        if ($@){
+        if ( defined $bug_fields{'actual_time'} ) {
+            eval {
+                Bugzilla::Bug::ValidateTime($bug_fields{'actual_time'}, "a");
+            };
+            if ($@){
+                $bug_fields{'actual_time'} = 0.0;
+                $err .= "Invalid Actual Time. Setting to 0.0\n";
+            }
+        }
+        else {
             $bug_fields{'actual_time'} = 0.0;
-            $err .= "Invalid Actual Time. Setting to 0.0\n";
+            $err .= "Actual time not defined. Setting to 0.0\n";
         }
     }