summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Util.pm3
-rwxr-xr-ximportxml.pl2
2 files changed, 4 insertions, 1 deletions
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 951c4df3c..3573ad148 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 fd8c27723..08bf06c93 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";