From 71736afa98446d1eea28f8ae7d7d57dc0e237815 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>

Date: Mon, 3 Nov 2014 12:54:50 +0100

Subject: [PATCH] Revert "on unix systems, look for /etc/timezone first before

 /etc/localtime"

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

This reverts commit d12b4612e1b6171081cf6f60d089fe340638ade7.

On Linux, the canonical source of time zone is /etc/locatime. Not

/etc/timezone.

<https://bugzilla.redhat.com/show_bug.cgi?id=1159509>

Signed-off-by: Petr Písař <ppisar@redhat.com>

---

 lib/DateTime/TimeZone/Local/Unix.pm | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/DateTime/TimeZone/Local/Unix.pm b/lib/DateTime/TimeZone/Local/Unix.pm

index 0f9beb1..db96616 100644

--- a/lib/DateTime/TimeZone/Local/Unix.pm

+++ b/lib/DateTime/TimeZone/Local/Unix.pm

@@ -9,8 +9,8 @@ use parent 'DateTime::TimeZone::Local';

 sub Methods {

     return qw(

         FromEnv

-        FromEtcTimezone

         FromEtcLocaltime

+        FromEtcTimezone

         FromEtcTIMEZONE

         FromEtcSysconfigClock

         FromEtcDefaultInit

-- 

1.9.3