Fixed bug in apache upgrade function.

diff --git a/src/functions.sh b/src/functions.sh
index 8183ddc..35cfa6b 100644 (file)
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -497,9 +497,17 @@ upgrade_apache () {
   for p in aosi-aai aosi-www-aai \
            php4-cn php4-odbc php4-xslt \
            squirrelmail-cn; do
-     pkg p && delpkg="$delpkg $p"
+
+     # remember installed packages
+     if pkg $p; then
+         delpkg="$delpkg $p"
+     fi
   done
-  eval pkgrm $delpkg
+
+  # remove problematic stuff
+  eval apt-get --yes remove $delpkg
+
+  # remove old apache
   pkgrm apache apache-common
 
   # install new packages