Bug 8840 - [SIGNED-OFF] Patch to solve false "All dependencies installed!"

Reordered logic to accumulate MISSING_PATCHES variable and tweak
condition to be certain it was not failing.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised, see Bugzilla for details.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>

diff --git a/install_misc/ubuntu-packages.sh b/install_misc/ubuntu-packages.sh
index ef2c2c6..33b6642 100755 (executable)
--- a/install_misc/ubuntu-packages.sh
+++ b/install_misc/ubuntu-packages.sh
@@ -141,16 +141,19 @@ for PACKAGE in $UBUNTU_PACKAGES; do
     # Test if the package is installed
     PACKAGE_INSTALLED=`packageInstalled $PACKAGE`
 
+    # Determine the package version if it is installed.
+    if [ "$PACKAGE_INSTALLED" == "yes" ]; then
+        PACKAGE_VERSION=`getPackageVersion $PACKAGE`
+
+    # otherwise default to 'none'.
+    else
+        PACKAGE_VERSION="none"
+        MISSING_PACKAGES="$PACKAGE $MISSING_PACKAGES"
+    fi
+
     # If we are supposed to report...
     if [ "$CHECK" == "yes" ]; then
 
-        # Determine the package version if it is installed.
-        if [ "$PACKAGE_INSTALLED" == "yes" ]; then
-            PACKAGE_VERSION=`getPackageVersion $PACKAGE`
-        # otherwise default to 'none'.
-        else
-            PACKAGE_VERSION="none"
-        fi
 
         # report the package name and version number.
         echo "$PACKAGE = $PACKAGE_VERSION"
@@ -163,7 +166,7 @@ for PACKAGE in $UBUNTU_PACKAGES; do
 done
 
 # If we aren't reporting, then the last echo didn't have a newline.
-if [ "$CHECK" != "yes" ]; then
+if [ ! "$CHECK" == "yes" ]; then
     echo
 fi