diff options
| author | Russ Cox <rsc@golang.org> | 2012-02-19 03:16:20 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2012-02-19 03:16:20 -0500 |
| commit | 90844a323feaaa3874f89bbd874aef2f32b4cf84 (patch) | |
| tree | 6b6bd1edd5015091e5d7cece1598f4c0407c9bb9 /src/pkg/time/zoneinfo_windows.go | |
| parent | acae2b643ab1c779b0363f03ec14e7bcd22bf12f (diff) | |
| download | go-90844a323feaaa3874f89bbd874aef2f32b4cf84.tar.gz | |
time: switch to using (uncompressed) zoneinfo zip file
Removal of old zoneinfo files is a separate CL due to its size.
R=golang-dev, bradfitz, r
CC=golang-dev
http://codereview.appspot.com/5676100
Diffstat (limited to 'src/pkg/time/zoneinfo_windows.go')
| -rw-r--r-- | src/pkg/time/zoneinfo_windows.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pkg/time/zoneinfo_windows.go b/src/pkg/time/zoneinfo_windows.go index b1a0c2206..754e392de 100644 --- a/src/pkg/time/zoneinfo_windows.go +++ b/src/pkg/time/zoneinfo_windows.go @@ -6,6 +6,7 @@ package time import ( "errors" + "runtime" "syscall" ) @@ -152,7 +153,7 @@ func initLocal() { } func loadLocation(name string) (*Location, error) { - if z, err := loadZoneFile(runtime.GOROOT() + `\lib\time\zoneinfo\` + name); err == nil { + if z, err := loadZoneFile(runtime.GOROOT()+`\lib\time\zoneinfo.zip`, name); err == nil { z.name = name return z, nil } |