From 414668cfbc41fd8cadf74e981849d1e05cc23b2e Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 22 Oct 2020 15:25:00 -0700 Subject: [release-branch.go1.15] time: support slim tzdata format Backport of part of https://golang.org/cl/261877 to support the slim tzdata format. As of tzdata 2020b, the default is to use the slim format. We need to support that format so that Go installations continue to work when tzdata is updated. Relevant part of the CL description: The reason for the failed tests was that when caching location data, the extended time format past the end of zone transitions was not considered. The respective change was introduced in (*Location).lookup by CL 215539. For #42138 Change-Id: I37f52a0917b2c6e3957e6b4612c8ef104c736e65 Reviewed-on: https://go-review.googlesource.com/c/go/+/264301 Trust: Ian Lance Taylor Reviewed-by: Tobias Klauser --- src/time/zoneinfo_read.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/time/zoneinfo_read.go b/src/time/zoneinfo_read.go index 6f789be92a..e9f1ab2ec6 100644 --- a/src/time/zoneinfo_read.go +++ b/src/time/zoneinfo_read.go @@ -325,8 +325,16 @@ func LoadLocationFromTZData(name string, data []byte) (*Location, error) { l.cacheEnd = omega if i+1 < len(tx) { l.cacheEnd = tx[i+1].when + } else if l.extend != "" { + // If we're at the end of the known zone transitions, + // try the extend string. + if _, _, estart, eend, ok := tzset(l.extend, l.cacheEnd, sec); ok { + l.cacheStart = estart + l.cacheEnd = eend + } } l.cacheZone = &l.zone[tx[i].index] + break } } -- cgit v1.2.3-54-g00ecf