mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
locale-setup: do not load locale from environemnt when /etc/locale.conf is unchanged
Previously, when /etc/locale.conf is unchanged, locales were loaded from
possibly outdated environment variable.
Fixes a bug introduced by 018befcff6 (v253).
Fixes #35717.
This commit is contained in:
committed by
Luca Boccassi
parent
51a0a3b049
commit
80797bbb91
@@ -75,7 +75,7 @@ static int locale_context_load_conf(LocaleContext *c, LocaleLoadFlag flag) {
|
||||
|
||||
/* If the file is not changed, then we do not need to re-read the file. */
|
||||
if (stat_inode_unmodified(&c->st, &st))
|
||||
return 0;
|
||||
return 1; /* (already) loaded */
|
||||
|
||||
c->st = st;
|
||||
locale_context_clear(c);
|
||||
|
||||
Reference in New Issue
Block a user