[Fai-commit] r5802 - in trunk: debian lib

[Thomas Lange]

Author: lange
Date: 2010-06-14 11:47:53 +0000 (Mon, 14 Jun 2010)
New Revision: 5802

Modified:
   trunk/debian/changelog
   trunk/lib/updatebase
Log:
updatebase: remove pre-lenny code

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-06-07 05:31:04 UTC (rev 5801)
+++ trunk/debian/changelog	2010-06-14 11:47:53 UTC (rev 5802)
@@ -6,8 +6,9 @@
   * ainsl: exit with 0 if line already exists in the file
   * sources.list: fix security.geo.debian.org domain entries
   * install_packages: Fix typo in info message (thanks Adrian Glaubitz)
+  * updatebase: remove pre-lenny code
 
- -- Thomas Lange <lange at debian.org>  Mon, 31 May 2010 16:50:25 +0200
+ -- Thomas Lange <lange at debian.org>  Sun, 13 Jun 2010 22:16:24 +0200
 
 fai (3.3.5) unstable; urgency=high
 

Modified: trunk/lib/updatebase
===================================================================
--- trunk/lib/updatebase	2010-06-07 05:31:04 UTC (rev 5801)
+++ trunk/lib/updatebase	2010-06-14 11:47:53 UTC (rev 5802)
@@ -32,14 +32,9 @@
 [ $? -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 $ROOTCMD aptitude --help | grep -q safe-upgrade; then
-    $ROOTCMD aptitude -y safe-upgrade
-else
-    $ROOTCMD aptitude -y upgrade
-fi
+$ROOTCMD aptitude -y safe-upgrade
 
-$ROOTCMD aptitude $aptopt -f -y dist-upgrade </dev/null
+$ROOTCMD aptitude $aptopt -f -y full-upgrade </dev/null
 # update dpkg info which packages are available
 tmp=$($ROOTCMD mktemp) || exit 88
 $ROOTCMD apt-cache dumpavail > $FAI_ROOT/$tmp