Fixed cdrom method problems

[apt.git] / apt-pkg / acquire-method.cc

diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc
index fc060d83eaa3c8c9db720d060b8dda1e11c0c625..b0176d3cb61c1f624a8ffe58e2a122414f976850 100644 (file)
--- a/apt-pkg/acquire-method.cc
+++ b/apt-pkg/acquire-method.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.cc,v 1.12 1998/12/04 22:56:50 jgg Exp $
+// $Id: acquire-method.cc,v 1.13 1998/12/05 01:45:19 jgg Exp $

 /* ######################################################################
 
    Acquire Method
 /* ######################################################################
 
    Acquire Method


@@ -205,11 +205,11 @@ bool pkgAcqMethod::MediaFail(string Required,string Drive)
    while (1)
    {
       if (WaitFd(STDIN_FILENO) == false)
    while (1)
    {
       if (WaitFd(STDIN_FILENO) == false)

-        exit(0);
+        return false;

       
       if (ReadMessages(STDIN_FILENO,MyMessages) == false)
       
       if (ReadMessages(STDIN_FILENO,MyMessages) == false)

-        exit(0);
-      
+        return false;
+

       string Message = MyMessages.front();
       MyMessages.erase(MyMessages.begin());
       
       string Message = MyMessages.front();
       MyMessages.erase(MyMessages.begin());
       


@@ -225,13 +225,13 @@ bool pkgAcqMethod::MediaFail(string Required,string Drive)
       // Change ack
       if (Number == 603)
       {
       // Change ack
       if (Number == 603)
       {

-        while (Message.empty() == false)
+        while (MyMessages.empty() == false)

         {
            Messages.push_back(MyMessages.front());
            MyMessages.erase(MyMessages.begin());
         }
 
         {
            Messages.push_back(MyMessages.front());
            MyMessages.erase(MyMessages.begin());
         }
 

-        return StringToBool(LookupTag(Message,"Fail"),false);
+        return !StringToBool(LookupTag(Message,"Fail"),false);

       }
       
       Messages.push_back(Message);
       }
       
       Messages.push_back(Message);