[svk-commit] r2363 - in branches/2.0-releng: lib/SVK

[nobody at bestpractical.com]

Author: clkao
Date: Mon Mar 26 13:26:44 2007
New Revision: 2363

Modified:
   branches/2.0-releng/Makefile.PL
   branches/2.0-releng/lib/SVK/Util.pm

Log:
Merge from trunk:
 r2360 at trunk:  clkao | 2007-03-26 18:14:20 +0100
 Fix a win32 regression caused by r1763, which replaces Date::Format
 with POSIX strftime, which turned out to be not portable enough.
 
 Revert to the old behaviour if we are on win32.  Also add Date::Format
 back as a dependency for win32.
 


Modified: branches/2.0-releng/Makefile.PL
==============================================================================
--- branches/2.0-releng/Makefile.PL	(original)
+++ branches/2.0-releng/Makefile.PL	Mon Mar 26 13:26:44 2007
@@ -91,6 +91,9 @@
     'Pod::Simple'              => '0',       # in core since 5.9.3
     'File::Spec'               => '3.19',    # in core since 5.9.3
 );
+requires(
+    'Date::Format'             => '',
+) if ($^O eq 'MSWin32');
 build_requires(
     'Test::More'               => '0.42',
 );

Modified: branches/2.0-releng/lib/SVK/Util.pm
==============================================================================
--- branches/2.0-releng/lib/SVK/Util.pm	(original)
+++ branches/2.0-releng/lib/SVK/Util.pm	Mon Mar 26 13:26:44 2007
@@ -953,6 +953,11 @@
 
 sub time2str {
     my ($format, $time) = @_;
+    if (IS_WIN32) {
+	require Date::Format;
+	goto \&Date::Format::time2str;
+    }
+
     require POSIX;
     return POSIX::strftime($format, localtime($time) );
 }