Ticket #3415: t3415-variant2-check-zoneinfo.diff

django/conf/__init__.py

@@ -103 +103 @@
         self.INSTALLED_APPS = new_installed_apps
 
         if hasattr(time, 'tzset'):
+            # Check whether the timezone is valid (Bug #3415)
+            zoneinfo_root = '/usr/share/zoneinfo'
+            if os.path.exists(zoneinfo_root) and not \
+               os.path.exists(os.path.join(zoneinfo_root, *(self.TIME_ZONE.split('/')))):
+                raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
             # Move the time zone info into os.environ. See ticket #2315 for why
             # we don't do this unconditionally (breaks Windows).
             os.environ['TZ'] = self.TIME_ZONE