From: Max Ushakov <ushmax@gmail.com>
Date: Fri, 21 Dec 2018 14:53:33 +0000 (+0300)
Subject: time: return ENOENT if a zoneinfo zip file is not found
X-Git-Tag: go1.12beta2~85
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=652d59861ee34b7cbef49cdd9da71fa822124e6e;p=gostls13.git

time: return ENOENT if a zoneinfo zip file is not found

Updates #20969

Change-Id: Ibcf0bf932d5b1de67c22c63dd8514ed7a5d198fb
Reviewed-on: https://go-review.googlesource.com/c/155538
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/time/zoneinfo_read.go b/src/time/zoneinfo_read.go
index b495217c06..d8d4070d5b 100644
--- a/src/time/zoneinfo_read.go
+++ b/src/time/zoneinfo_read.go
@@ -271,7 +271,7 @@ func get2(b []byte) int {
 func loadTzinfoFromZip(zipfile, name string) ([]byte, error) {
 	fd, err := open(zipfile)
 	if err != nil {
-		return nil, errors.New("open " + zipfile + ": " + err.Error())
+		return nil, err
 	}
 	defer closefd(fd)