[Fai-commit] r4770 - trunk/lib

[lange at alioth.debian.org]

Author: lange
Date: 2007-11-19 18:34:42 +0000 (Mon, 19 Nov 2007)
New Revision: 4770

Modified:
   trunk/lib/updatebase
Log:
call safe-upgrade when available


Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase	2007-11-18 16:22:06 UTC (rev 4769)
+++ trunk/lib/updatebase	2007-11-19 18:34:42 UTC (rev 4770)
@@ -31,6 +31,13 @@
 [ $? -ne 0 ] && yes '' | $ROOTCMD dpkg --configure -a 
 # using the above value, causes an error: "dpkg need action"
 export aptopt=
+# this may be removed in lenny
+if strings $FAI_ROOT/usr/bin/aptitude | grep -q safe-upgrade; then
+    $ROOTCMD aptitude -y safe-upgrade
+else
+    $ROOTCMD aptitude -y upgrade
+fi
+
 $ROOTCMD aptitude $aptopt -f -y dist-upgrade </dev/null
 # update dpkg info which packages are available
 tmp=$($ROOTCMD mktemp)