From 27e490add819394a12221602fd950e7bc1522b03 Mon Sep 17 00:00:00 2001 From: Stevan Earl Date: Sat, 16 Sep 2023 12:51:43 -0700 Subject: [PATCH] fix: ensure consistent db config file sorting --- make_files/make_db.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/make_files/make_db.mk b/make_files/make_db.mk index 4517ce3..215f0ed 100644 --- a/make_files/make_db.mk +++ b/make_files/make_db.mk @@ -589,7 +589,7 @@ GET_PG_SETTINGS := SELECT name, setting, unit, pending_restart \ GET_AZ_SERVER_SETTINGS := az postgres flexible-server parameter list \ --resource-group $(RESOURCEGROUP) \ --server $(TARGET_SERVER) - +SORT := LC_COLLATE=C sort --stable ## ## The available targets for make (make TARGET) are: ## @@ -712,7 +712,7 @@ db/pg_settings.new: | psql $(PSQL_ARGS_MINIMAL) --tuples-only \ > $${tfile} \ || exit $? ; \ - sort --stable $${tfile} \ + $(SORT) $${tfile} \ > db/pg_settings.new ## compare-db-settings @@ -724,8 +724,8 @@ db/pg_settings.new: compare-db-settings: printf '$(GET_PG_SETTINGS)\n' \ | psql $(PSQL_ARGS_MINIMAL) --tuples-only \ - | sort --stable \ - | diff -U 0 db/pg_settings /dev/stdin + | $(SORT) \ + | diff --ignore-space-change -U 0 db/pg_settings /dev/stdin ## db/az_server_info.new ## Save a file of all configuration and other -- 2.34.1