G++3 fixes from Randolph

[apt.git] / dselect / update

diff --git a/dselect/update b/dselect/update
index 87dc21aa1d99582bc473829b93166f1307eaa4dc..66b942bcbaa50ec4d17cdc3b378ba5c4dbbf69b3 100755 (executable)
--- a/dselect/update
+++ b/dselect/update
@@ -2,31 +2,44 @@
 set -e
 
 # Get the configuration from /etc/apt/apt.conf
 set -e
 
 # Get the configuration from /etc/apt/apt.conf

+CLEAN="prompt"

 OPTS="-f"
 APTGET="/usr/bin/apt-get"
 APTCACHE="/usr/bin/apt-cache"
 DPKG="/usr/bin/dpkg"
 OPTS="-f"
 APTGET="/usr/bin/apt-get"
 APTCACHE="/usr/bin/apt-cache"
 DPKG="/usr/bin/dpkg"

+DPKG_OPTS="--admindir=$1"
+APT_OPT0="-oDir::State::status=$1/status"
+APT_OPT1="-oDPkg::Options::=$DPKG_OPTS"

 CACHEDIR="/var/cache/apt"
 CACHEDIR="/var/cache/apt"

-PROMPT="no"
-RES=`apt-config shell OPTS DSelect::UpdateOptions \
-      DPKG Dir::Bin::dpkg APTGET Dir::Bin::apt-get \
-      APTCACHE Dir::Bin::apt-cache CACHEDIR Dir::Cache \
-      PROMPT DSelect::PromptAfterUpdate`
+PROMPT="false"
+RES=`apt-config shell CLEAN DSelect::Clean OPTS DSelect::UpdateOptions \
+                     DPKG Dir::Bin::dpkg/f APTGET Dir::Bin::apt-get/f \
+                     APTCACHE Dir::Bin::apt-cache/f CACHEDIR Dir::Cache/d \
+                     PROMPT DSelect::PromptAfterUpdate/b`

 eval $RES
 
 # It looks slightly ugly to have a double / in the dpkg output
 CACHEDIR=`echo $CACHEDIR | sed -e "s|/$||"`
 
 eval $RES
 
 # It looks slightly ugly to have a double / in the dpkg output
 CACHEDIR=`echo $CACHEDIR | sed -e "s|/$||"`
 

-$APTGET $OPTS update
+STATUS=1
+if $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" update
+then
+    echo "Merging Available information"
+    rm -f $CACHEDIR/available
+    $APTCACHE dumpavail > $CACHEDIR/available
+    $DPKG "$DPKG_OPTS" --update-avail $CACHEDIR/available
+    rm -f $CACHEDIR/available

 
 

-echo "Merging Available information"
-rm -f /var/cache/apt/available
-$APTCACHE dumpavail > $CACHEDIR/available
-$DPKG --update-avail $CACHEDIR/available
-rm -f $CACHEDIR/available
+    case "$CLEAN" in
+       Pre-Auto|PreAuto|pre-auto)
+           $APTGET "$APT_OPT0" "$APT_OPT1" autoclean;;
+    esac

 
 

-if [ $PROMPT = "yes" ]; then
+    STATUS=0
+fi
+
+if [ x$PROMPT = "xtrue" ]; then

    echo "Press enter to continue." && read RES;
 fi
 
    echo "Press enter to continue." && read RES;
 fi
 

-exit 0
+exit $STATUS