Blame SOURCES/go1.5-zoneinfo_testing_only.patch
|
 |
421416 |
diff --git a/src/time/zoneinfo_unix.go b/src/time/zoneinfo_unix.go
|
|
|
421416 |
index ed9502d..c2569e7 100644
|
|
|
421416 |
--- a/src/time/zoneinfo_unix.go
|
|
|
421416 |
+++ b/src/time/zoneinfo_unix.go
|
|
|
421416 |
@@ -32,14 +32,14 @@ var zoneDirs = []string{
|
|
|
421416 |
"/usr/share/zoneinfo/",
|
|
|
421416 |
"/usr/share/lib/zoneinfo/",
|
|
|
421416 |
"/usr/lib/locale/TZ/",
|
|
|
421416 |
- runtime.GOROOT() + "/lib/time/zoneinfo.zip",
|
|
|
421416 |
}
|
|
|
421416 |
|
|
|
421416 |
var origZoneDirs = zoneDirs
|
|
|
421416 |
|
|
|
421416 |
func forceZipFileForTesting(zipOnly bool) {
|
|
|
421416 |
- zoneDirs = make([]string, len(origZoneDirs))
|
|
|
421416 |
+ zoneDirs = make([]string, len(origZoneDirs)+1)
|
|
|
421416 |
copy(zoneDirs, origZoneDirs)
|
|
|
421416 |
+ zoneDirs = append(zoneDirs, runtime.GOROOT()+"/lib/time/zoneinfo.zip")
|
|
|
421416 |
if zipOnly {
|
|
|
421416 |
for i := 0; i < len(zoneDirs)-1; i++ {
|
|
|
421416 |
zoneDirs[i] = "/XXXNOEXIST"
|