From 1b2bee0e76d472662002dc087b5045e0ff63edf5 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 6 Oct 2020 13:20:22 +0200
Subject: [PATCH] build: fix "create-exports-NetworkManager.sh" to fail if "nm"
 fails

Despite `set -e`, the shell script does not fail if the command in the
here document fails. This can happen if binutils' "nm" fails.

  NM=/bin/false "./tools/create-exports-NetworkManager.sh" --called-from-build "."

(cherry picked from commit 7fe76f54e3a5bf3080633628c0de222e252ff9bf)
---
 tools/create-exports-NetworkManager.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh
index f439bd3112..6cb7c2e72b 100755
--- a/tools/create-exports-NetworkManager.sh
+++ b/tools/create-exports-NetworkManager.sh
@@ -46,7 +46,7 @@ get_symbols_nm () {
         _sort
 }
 
-get_symbols_explict() {
+get_symbols_explicit() {
     cat <<EOF | _sort
 _IO_stdin_used
 EOF
@@ -60,7 +60,7 @@ get_symbols_missing() {
             sed -n 's/^\([U]\) \(\(nm_\|nmp_\|_nm\|NM\|_NM\|nmtst_\|c_siphash_\|c_list_\).*\)$/\2/p'
     done) |
         _sort |
-        grep -Fx -f <(get_symbols_explict) -v |
+        grep -Fx -f <(get_symbols_explicit) -v |
         grep -Fx -f <(get_symbols_nm)
 }
 
@@ -82,14 +82,17 @@ do_update() {
     do_generate > ./src/NetworkManager.ver
 }
 
+SYMBOLS_MISSING="$(get_symbols_missing | pretty)"
+SYMBOLS_EXPLICIT="$(get_symbols_explicit | pretty)"
+
 do_generate() {
     cat <<EOF
 # this file is generated by $0
 {
 global:
-$(get_symbols_missing | pretty)
+$SYMBOLS_MISSING
 
-$(get_symbols_explict | pretty)
+$SYMBOLS_EXPLICIT
 local:
 	*;
 };