From 7c84acc455368721e046dc0cc2eb84d62c4f5e61 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 18 Aug 2017 23:02:28 -0400
Subject: [PATCH] Fix creation of ICU comments for keyword variants

It would create the comment referring to the keyword-less parent
locale.  This was broken in ddb5fdc068635d003a0d1c303cb109d1cb3ebeb1.
---
 src/backend/commands/collationcmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
index 96a6bc9bf08..8572b2dedc4 100644
--- a/src/backend/commands/collationcmds.c
+++ b/src/backend/commands/collationcmds.c
@@ -775,7 +775,7 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
 
 					CommandCounterIncrement();
 
-					icucomment = get_icu_locale_comment(name);
+					icucomment = get_icu_locale_comment(localeid);
 					if (icucomment)
 						CreateComments(collid, CollationRelationId, 0,
 									   icucomment);