Fix bugs in plugin selection script.

Resolves: #2030671

redhat-annobin-plugin-select.sh

@@ -31,7 +31,7 @@ fi
 
 # Set this variable to non-zero to enable the generation of debugging
 # messages.
-debug=1
+debug=0
 
 # Decide which version of the annobin plugin for gcc should be used.
 # There are two possible versions, one created by the annobin package and one
@@ -144,8 +144,10 @@ then
 	    else
 		if [ $debug -eq 1 ]
 		then
-		    echo "  redhat-rpm-config: Neither version file exists - not changing $rac1"
+		    echo "  redhat-rpm-config: Neither version file exists - playing safe and using gcc-built plugin"
+		    echo "  redhat-rpm-config: Note: expected to find $aver and/or $gver"
 		fi
+		install_gcc_version=1
 	    fi
 	fi
     else
@@ -162,15 +164,14 @@ else
 	then
 	    echo "  redhat-rpm-config: Only the gcc plugin exists - using that"
 	fi
-	install_gcc_version=1
     else
 	if [ $debug -eq 1 ]
 	then
-	    echo "  redhat-rpm-config: Neither plugin exists - doing nothing"
-	    echo "  redhat-rpm-config: Expected $aplugin and/or $gplugin"
+	    echo "  redhat-rpm-config: Neither plugin exists - playing safe and using gcc-built plugin"
+	    echo "  redhat-rpm-config: Note: expected to find $aplugin and/or $gplugin"
 	fi
-	return 0
     fi
+    install_gcc_version=1
 fi
 
 if [ $install_annobin_version -eq 1 ]

redhat-rpm-config.spec

@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 192
+Version: 193
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -213,6 +213,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
 %doc buildflags.md
 
 %changelog
+* Tue Feb 15 2022 Nick Clifton  <nickc@redhat.com> - 193-1
+- Fix bugs in plugin selection script.
+- Resolves: rhbz#2030671
+
 * Tue Feb 01 2022 Nick Clifton  <nickc@redhat.com> - 192-1
 - Select between gcc-built and annobin-built versions of the annobin plugin.
 - Resolves: rhbz#2030671