Skip to content

Commit 7c20ebe

Browse files
yuwatabluca
authored andcommitted
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 018befc (v253). Fixes #35717. (cherry picked from commit 80797bb) (cherry picked from commit d00cc09) (cherry picked from commit d19d42b) (cherry picked from commit 79b3378) (cherry picked from commit f043ab6)
1 parent 12c948b commit 7c20ebe

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/shared/locale-setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static int locale_context_load_conf(LocaleContext *c, LocaleLoadFlag flag) {
7575

7676
/* If the file is not changed, then we do not need to re-read the file. */
7777
if (stat_inode_unmodified(&c->st, &st))
78-
return 0;
78+
return 1; /* (already) loaded */
7979

8080
c->st = st;
8181
locale_context_clear(c);

0 commit comments

Comments
 (0)