rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow initdb to complete on systems without "locale" command 

This partially reverts 2fe3bdbd69, which
added an error check on the "locale -a" execution.  This is removed
again, adding a comment explaining why.  We already had code that
shows a warning if no system locales could be found, which should be
sufficient for feedback to the user.

Discussion: https://www.postgresql.org/message-id/flat/b2b491d1-3b36-15b9-6910-5b5540b27f5c%40enterprisedb.com
This commit is contained in:
Peter Eisentraut 2022-11-17 12:12:11 +01:00
parent 3b304547a9
commit af3abca029
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/commands/collationcmds.c
View File

@ -640,7 +640,6 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
int naliases, int naliases,
maxaliases, maxaliases,
i; i;
int pclose_rc;
/* expansible array of aliases */ /* expansible array of aliases */
maxaliases = 100; maxaliases = 100;
@ -747,15 +746,13 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
} }
} }
pclose_rc = ClosePipeStream(locale_a_handle); /*
if (pclose_rc != 0) * We don't check the return value of this, because we want to support
{ * the case where there "locale" command does not exist. (This is
ereport(ERROR, * unusual but can happen on minimalized Linux distributions, for
(errcode_for_file_access(), * example.) We will warn below if no locales could be found.
errmsg("could not execute command \"%s\": %s", */
"locale -a", ClosePipeStream(locale_a_handle);
wait_result_to_str(pclose_rc))));
}
/* /*
* Before processing the aliases, sort them by locale name. The point * Before processing the aliases, sort them by locale name. The point