Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5fd3e06

Browse files
committed
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/20231027152049.4b5c8044@wagner.wagner.home
1 parent 4b9fbd6 commit 5fd3e06

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

src/timezone/tznames/Default

-1
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,6 @@ NZST 43200 # New Zealand Standard Time
618618
# (Antarctica/McMurdo)
619619
# (Pacific/Auckland)
620620
PGT 36000 # Papua New Guinea Time (obsolete)
621-
PHOT Pacific/Enderbury # Phoenix Islands Time (Kiribati) (obsolete)
622621
PONT 39600 # Ponape Time (Micronesia) (obsolete)
623622
PWT 32400 # Palau Time (obsolete)
624623
TAHT -36000 # Tahiti Time (obsolete)

src/timezone/tznames/Pacific.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ NZST 43200 # New Zealand Standard Time
5050
# (Antarctica/McMurdo)
5151
# (Pacific/Auckland)
5252
PGT 36000 # Papua New Guinea Time (obsolete)
53-
PHOT Pacific/Enderbury # Phoenix Islands Time (Kiribati) (obsolete)
53+
PHOT Pacific/Kanton # Phoenix Islands Time (Kiribati) (obsolete)
5454
PONT 39600 # Ponape Time (Micronesia) (obsolete)
5555
# CONFLICT! PST is not unique
5656
# Other timezones:

0 commit comments

Comments
 (0)