646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
14 lines
728 B
Diff
14 lines
728 B
Diff
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
|
|
index 22f1eab..3a752d1 100644
|
|
--- a/django/conf/__init__.py
|
|
+++ b/django/conf/__init__.py
|
|
@@ -208,7 +208,7 @@ class Settings:
|
|
if hasattr(time, "tzset") and self.TIME_ZONE:
|
|
# When we can, attempt to validate the timezone. If we can't find
|
|
# this file, no check happens and it's harmless.
|
|
- zoneinfo_root = Path("/usr/share/zoneinfo")
|
|
+ zoneinfo_root = Path("@zoneinfo@")
|
|
zone_info_file = zoneinfo_root.joinpath(*self.TIME_ZONE.split("/"))
|
|
if zoneinfo_root.exists() and not zone_info_file.exists():
|
|
raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
|