Undid undoing for bug 65952, fix is in aliencode

Author: jgg
Date: 2000-07-31 05:05:54 GMT
Undid undoing for bug 65952, fix is in aliencode

diff --git a/debian/changelog b/debian/changelog
index 88064799a247cc63f72fa90a2845a4254a92eff4..b723440da36529ccaa2956013c4851abe9b0cf0b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ apt (0.3.19) frozen unstable; urgency=low
   * Update sizetable for mips. Closes: #62288
   * Fixed a bug with passive FTP connections
   * Has sizetable entry for sparc64. Closes: #64869
   * Update sizetable for mips. Closes: #62288
   * Fixed a bug with passive FTP connections
   * 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
  
   
  -- Ben Gertzfield <che@debian.org>  Fri, 12 May 2000 21:10:54 -0700
  

diff --git a/dselect/install b/dselect/install
index e543344b53337d485d3b6b40981b4fbc55300efc..8ac3523bdb4194303a3a945bd9a86de6f868c3dd 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -39,6 +39,7 @@ yesno() {
        echo $ans | tr YN yn
 }
 
        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
 if [ x$WAIT = "xyes" ]; then
    $APTGET $OPTS -d dselect-upgrade
    echo "Press enter to continue." && read RES


@@ -62,6 +63,11 @@ if [ $RES -eq 0 ]; then
       exit 0
    fi
 
       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)
    # Check the cleaning mode
    case `echo $CLEAN | tr '[:upper:]' '[:lower:]'` in
      auto)


@@ -72,7 +78,7 @@ if [ $RES -eq 0 ]; then
        ;;
      prompt)
        exec 3>&1
        ;;
      prompt)
        exec 3>&1

-       if [ `yesno "Do you want to erase any previously downloaded .deb files?" y` = y ]; then
+       if [ `yesno "Do you want to erase the downloaded .deb files?" y` = y ]; then

           $APTGET clean && echo "Press enter to continue." && read RES && exit 0;
        fi
        ;;
           $APTGET clean && echo "Press enter to continue." && read RES && exit 0;
        fi
        ;;