Fixed to new security and non-us urls

[apt.git] / dselect / update

diff --git a/dselect/update b/dselect/update
index ec5e78cc232d4874a6d720ca12bb5b6097e8f7c9..904648428191ce1e718d38a82059faba5c00b431 100755 (executable)
--- a/dselect/update
+++ b/dselect/update
@@ -14,7 +14,13 @@ RES=`apt-config shell OPTS DSelect::UpdateOptions \
       PROMPT DSelect::PromptAfterUpdate`
 eval $RES
 
       PROMPT DSelect::PromptAfterUpdate`
 eval $RES
 

-$APTGET $OPTS update
+# It looks slightly ugly to have a double / in the dpkg output
+CACHEDIR=`echo $CACHEDIR | sed -e "s|/$||"`
+
+set +e
+FAILED=0
+$APTGET $OPTS update || FAILED=1
+set -e

 
 echo "Merging Available information"
 rm -f /var/cache/apt/available
 
 echo "Merging Available information"
 rm -f /var/cache/apt/available


@@ -26,4 +32,4 @@ if [ $PROMPT = "yes" ]; then
    echo "Press enter to continue." && read RES;
 fi
 
    echo "Press enter to continue." && read RES;
 fi
 

-exit 0
+exit $FAILED