[OS-BUILD PATCHv3 5/6] CI: ark-update-configs: misc changes

[Don Zickus (via Email Bridge)]

From: Don Zickus <dzickus(a)redhat.com&gt;

CI: ark-update-configs: misc changes

Simple changes in preparation to help with readability with later
changes.

No behavior changes.

Signed-off-by: Don Zickus <dzickus(a)redhat.com&gt;

diff --git a/redhat/scripts/ci/ark-update-configs.sh
b/redhat/scripts/ci/ark-update-configs.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/ci/ark-update-configs.sh
+++ b/redhat/scripts/ci/ark-update-configs.sh
@@ -22,6 +22,15 @@ set -e
 # shellcheck source=./redhat/scripts/ci/ark-ci-env.sh
 . "$(dirname "$0")"/ark-ci-env.sh
 
+finish()
+{
+	rm "$TMPFILE"
+}
+trap finish EXIT
+
+TMPFILE=".push-warnings"
+touch $TMPFILE
+
 ISSUE_DESCRIPTION="A merge conflict has occurred and must be resolved manually.
 
 To resolve this, do the following:
@@ -45,7 +54,7 @@ if ! git merge -m "Merge '$UPSTREAM_REF' into
'$BRANCH'" "$UPSTREAM_REF"; then
 				--description "$ISSUE_DESCRIPTION"
 		fi
 	fi
-	exit 1
+	die "Merge conflicts"
 fi
 
 # Generates and commits all the pending configs
@@ -60,7 +69,9 @@ new_head="$(git rev-parse HEAD)"
 # Converts each new pending config from above into its finalized git
 # configs/<date>/<config> branch.  These commits are used for Merge
 # Requests.
-if [ "$old_head" != "$new_head" ]; then
+[ "$old_head" != "$new_head" ] && CONFIGS_ADDED="1"
|| CONFIGS_ADDED=""
+
+if test "$CONFIGS_ADDED"; then
 	./redhat/scripts/genspec/gen_config_patches.sh
 else
 	printf "No new configuration values exposed from merging %s into $BRANCH\n"
"$UPSTREAM_REF"

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2518