From 7df585d13d6b85b58045c00460f7c9fed7ecb2ae Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Sun, 1 Jul 2018 01:35:38 +0530 Subject: time: improve error message for LoadLocation Currently, when a tz file was being checked inside a zoneInfo dir, a syscall.ENOENT error was being returned, which caused it to look in the zoneinfo.zip file and return an error for that case. We return a syscall.ENOENT error for the zip file case too, so that it falls through to the end of the loop and returns an uniform error for both cases. Fixes #20969 Change-Id: If1de068022ac7693caabb5cffd1c929878460140 Reviewed-on: https://go-review.googlesource.com/121877 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/time/zoneinfo_read.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/time/zoneinfo_read.go') diff --git a/src/time/zoneinfo_read.go b/src/time/zoneinfo_read.go index 29244db29e..15d6aab1de 100644 --- a/src/time/zoneinfo_read.go +++ b/src/time/zoneinfo_read.go @@ -364,7 +364,7 @@ func loadTzinfoFromZip(zipfile, name string) ([]byte, error) { return buf, nil } - return nil, errors.New("cannot find " + name + " in zip file " + zipfile) + return nil, syscall.ENOENT } // loadTzinfoFromTzdata returns the time zone information of the time zone -- cgit v1.2.1