From: lpsolit%gmail.com <>
Date: Thu, 5 Feb 2009 18:37:16 +0000 (+0000)
Subject: Bug 476889: importxml.pl crashes when importing bugs (Date::Parse::strptime() leave... 
X-Git-Tag: bugzilla-3.3.4~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d01cb036c10487b653fd5a74a64f38093a863c7;p=thirdparty%2Fbugzilla.git

Bug 476889: importxml.pl crashes when importing bugs (Date::Parse::strptime() leave seconds undefined in some cases) - Patch by Frédéric Buclin <LpSolit@gmail.com> r=ghendricks a=LpSolit
---

diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 951c4df3c8..3573ad1480 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -444,6 +444,9 @@ sub format_time {
     my @time = strptime($date);
 
     if (scalar @time) {
+        # Fix a bug in strptime() where seconds can be undefined in some cases.
+        $time[0] ||= 0;
+
         # strptime() counts years from 1900, and months from 0 (January).
         # We have to fix both values.
         my $dt = DateTime->new({year   => 1900 + $time[5],
diff --git a/importxml.pl b/importxml.pl
index fd8c27723d..08bf06c93c 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -567,7 +567,7 @@ sub process_bug {
     my $comments;
 
     $comments .= "\n\n--- Bug imported by $exporter_login ";
-    $comments .= format_time(localtime(time()), '%Y-%m-%d %H:%M %Z') . " ";
+    $comments .= format_time(scalar localtime(time()), '%Y-%m-%d %R %Z') . " ";
     $comments .= " ---\n\n";
     $comments .= "This bug was previously known as _bug_ $bug_fields{'bug_id'} at ";
     $comments .= $urlbase . "show_bug.cgi?id=" . $bug_fields{'bug_id'} . "\n";