From f8011e550137d1fced894ce4861e6d170eff9bd5 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 17 Jan 2014 12:51:28 +0100
Subject: [packagemanager.inc] minor improvements to output message when a
 package appears to not be installed or is a meta-package

---
 remote/includes/packagemanager.inc | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

(limited to 'remote/includes')

diff --git a/remote/includes/packagemanager.inc b/remote/includes/packagemanager.inc
index 6f0d86dd..edd3949e 100644
--- a/remote/includes/packagemanager.inc
+++ b/remote/includes/packagemanager.inc
@@ -60,7 +60,9 @@ install_packages() {
 	local INSTALLED_PACKAGES=""
 
 	for PKG in ${PACKAGE_LIST}; do
-		# check if installed
+		# check if installed:
+		# this is done mainly for performance reasons, even though
+		# reinstalling all packages is a valid possibility too...		
 		if [ "x$PACKET_HANDLER" == "xdpkg" ]; then
 			dpkg -l ${PKG} > /dev/null 2>&1
 		elif [ "x$PACKET_HANDLER" == "xrpm" ]; then
@@ -71,15 +73,19 @@ install_packages() {
 
 		local LRET=$?
 		if [ "x$LRET" == "x0" ]; then
-			# check if it is completly installed,
-			# not just leftover configuration files
-			local INSTALL_STATUS=$(dpkg -l $PKG | grep $PKG | cut -c1-2)
-			if [[ $INSTALL_STATUS != "ii" ]]; then
-				pinfo "$PKG not installed!"
+			# check if it is completly installed, not just leftover configuration files
+			if [ "x$PACKET_HANDLER" == "xdpkg" ]; then
+				local INSTALL_STATUS=$(dpkg -l $PKG | grep $PKG | cut -c1-2)
+				if [[ $INSTALL_STATUS != "ii" ]]; then
+					pinfo "$PKG is either missing or a meta-package! Installing it to be sure..."
+					install_package $PKG
+				else
+					# package installed
+					pdebug "$PKG installed!"
+				fi
+			elif [ "x$PACKET_HANDLER" == "xrpm" ]; then
+				# TODO: blindly install again for now
 				install_package $PKG
-			else
-				# package installed
-				pdebug "$PKG installed!"
 			fi
 		else
 			# package not installed
@@ -87,7 +93,7 @@ install_packages() {
 			install_package $PKG
 		fi
 	done
-	[ ! -z "$INSTALLED_PACKAGES" ] && pinfo "Packages installed: ${INSTALLED_PACKAGES}"
+	[ ! -z "$INSTALLED_PACKAGES" ] && pinfo "New packages installed: ${INSTALLED_PACKAGES}"
 }
 
 #
-- 
cgit v1.2.3-55-g7522