summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2023-10-28 15:54:40 +0000
committerTom Lane2023-10-28 15:54:40 +0000
commit5fd3e06f6ad1035da71124a79208242cd915ba2e (patch)
treec7ad426c7e3a6fec9d2160037126393eb7bbf2fd
parent4b9fbd6be442cf36910fb34308e0edfd43f2dbdf (diff)
Remove PHOT from our default timezone abbreviations list.
Debian recently decided to split out a bunch of "obsolete" timezone names into a new tzdata-legacy package, which isn't installed by default. One of these zone names is Pacific/Enderbury, and that breaks our regression tests (on --with-system-tzdata builds) because our default timezone abbreviations list defines PHOT as Pacific/Enderbury. Pacific/Enderbury got renamed to Pacific/Kanton in tzdata 2021b, so that in distros that still have this entry it's just a symlink to Pacific/Kanton anyway. So one answer would be to redefine PHOT as Pacific/Kanton. However, then things would fail if the installed tzdata predates 2021b, which is recent enough that that seems like a real problem. Instead, let's just remove PHOT from the default list. That seems likely to affect nobody in the real world, because (a) it was an abbreviation that the tzdb crew made up in the first place, with no evidence of real-world usage, and (b) the total human population of the Phoenix Islands is less than two dozen persons, per Wikipedia. If anyone does use this zone abbreviation they can easily put it back via a custom abbreviations file. We'll keep PHOT in the Pacific.txt reference file, but change it to Pacific/Kanton there, as that definition seems more likely to be useful to future readers of that file. Per report from Victor Wagner. Back-patch to all supported branches. Discussion: https://postgr.es/m/[email protected]
-rw-r--r--src/timezone/tznames/Default1
-rw-r--r--src/timezone/tznames/Pacific.txt2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index 8a4dc59f88..563a125353 100644
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -618,7 +618,6 @@ NZST 43200 # New Zealand Standard Time
# (Antarctica/McMurdo)
# (Pacific/Auckland)
PGT 36000 # Papua New Guinea Time (obsolete)
-PHOT Pacific/Enderbury # Phoenix Islands Time (Kiribati) (obsolete)
PONT 39600 # Ponape Time (Micronesia) (obsolete)
PWT 32400 # Palau Time (obsolete)
TAHT -36000 # Tahiti Time (obsolete)
diff --git a/src/timezone/tznames/Pacific.txt b/src/timezone/tznames/Pacific.txt
index c30008cb04..556a370af5 100644
--- a/src/timezone/tznames/Pacific.txt
+++ b/src/timezone/tznames/Pacific.txt
@@ -50,7 +50,7 @@ NZST 43200 # New Zealand Standard Time
# (Antarctica/McMurdo)
# (Pacific/Auckland)
PGT 36000 # Papua New Guinea Time (obsolete)
-PHOT Pacific/Enderbury # Phoenix Islands Time (Kiribati) (obsolete)
+PHOT Pacific/Kanton # Phoenix Islands Time (Kiribati) (obsolete)
PONT 39600 # Ponape Time (Micronesia) (obsolete)
# CONFLICT! PST is not unique
# Other timezones: