Changed handling of the no-dowload case

Author: jgg
Date: 2000-06-21 01:58:21 GMT
Changed handling of the no-dowload case

diff --git a/debian/changelog b/debian/changelog
index e71c598b44db3715620b6c3c28e810e3397c5788..88064799a247cc63f72fa90a2845a4254a92eff4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 apt (0.3.19) frozen unstable; urgency=low
 
-  * Added --dry-run to match docs. Closes #65153, #64292
-  * Obscure divide by zero problem. Closes #64394
-  * Update sizetable for mips. Closes #62288
+  * Added --dry-run to match docs. Closes: #65153, #64292
+  * Obscure divide by zero problem. Closes: #64394
+  * Update sizetable for mips. Closes: #62288
   * Fixed a bug with passive FTP connections
-  * Has sizetable entry for sparc64. Closes #64869
+  * Has sizetable entry for sparc64. Closes: #64869
+  * Undid the fix to bug #55709. Closes: #65952
   
  -- Ben Gertzfield <che@debian.org>  Fri, 12 May 2000 21:10:54 -0700
  

diff --git a/dselect/install b/dselect/install
index 8ac3523bdb4194303a3a945bd9a86de6f868c3dd..e543344b53337d485d3b6b40981b4fbc55300efc 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -39,7 +39,6 @@ yesno() {
        echo $ans | tr YN yn
 }
 
-OLDLS=`ls -ld $ARCHIVES`
 if [ x$WAIT = "xyes" ]; then
    $APTGET $OPTS -d dselect-upgrade
    echo "Press enter to continue." && read RES
@@ -63,11 +62,6 @@ if [ $RES -eq 0 ]; then
       exit 0
    fi
 
-   NEWLS=`ls -ld $ARCHIVES`
-   if [ "x$OLDLS" = "x$NEWLS" ]; then
-      exit 0
-   fi
-   
    # Check the cleaning mode
    case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in
      auto)
@@ -78,7 +72,7 @@ if [ $RES -eq 0 ]; then
        ;;
      prompt)
        exec 3>&1
-       if [ `yesno "Do you want to erase the downloaded .deb files?" y` = y ]; then
+       if [ `yesno "Do you want to erase any previously downloaded .deb files?" y` = y ]; then
           $APTGET clean && echo "Press enter to continue." && read RES && exit 0;
        fi
        ;;