From 1cd83a72a2c9392065f51365991880915795d445 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Fri, 15 Sep 2023 18:49:53 -0500
Subject: [PATCH] Do not alter the stored configurations on error

---
 make_files/make_db.mk | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/make_files/make_db.mk b/make_files/make_db.mk
index aefd4df..000fd97 100644
--- a/make_files/make_db.mk
+++ b/make_files/make_db.mk
@@ -705,9 +705,14 @@ drop-public-root:
 ##                      change to revision control.
 .PHONY: db/pg_settings.new
 db/pg_settings.new:
+	tfile=$$(mktemp) ; \
+	cleanup () { rm -rf $${tfile} ; } ; \
+	trap cleanup EXIT ; \
 	printf '$(GET_PG_SETTINGS)\n' \
 	  | psql $(PSQL_ARGS_MINIMAL) --tuples-only \
-	  | sort --stable \
+	  > $${tfile} \
+	  || exit $? ; \
+	sort --stable $${tfile} \
 	  > db/pg_settings.new
 
 ##   compare-db-settings
@@ -741,8 +746,13 @@ db/az_server_info.new:
 	[ -n "$(RESOURCEGROUP)" ] \
            || { printf 'The RESOURCEGROUP variable must be set\n' >&2 ; \
                 exit 1 ; }
+	tfile=$$(mktemp) ; \
+	cleanup () { rm -rf $${tfile} ; } ; \
+	trap cleanup EXIT ; \
 	$(GET_AZ_SERVER_SETTINGS) \
-	  | jq --sort-keys \
+	  > $${tfile} \
+	  || exit $? ; \
+	jq --sort-keys < $${tfile} \
 	  > db/az_server_info.new 
 
 ##   compare-az-server   Diff the configuration settings of the MS Azure
-- 
2.34.1