methods/gzip.cc: With FileFd now being able to read gzipped files, there

[apt.git] / cmdline / acqprogress.cc

diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc
index 558558ade0d5030b759b7f82a6a4b06f7a9e1f17..32e8243bfe574aa82441a72174de0bfc9f0815cd 100644 (file)
--- a/cmdline/acqprogress.cc
+++ b/cmdline/acqprogress.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: acqprogress.cc,v 1.23 2003/02/02 22:24:11 jgg Exp $
+// $Id: acqprogress.cc,v 1.24 2003/04/27 01:56:48 doogie Exp $
 /* ######################################################################
 
    Acquire Progress - Command line progress meter 
@@ -145,12 +145,12 @@ void AcqTextStatus::Stop()
    bandwidth and ETA indicator. */
 bool AcqTextStatus::Pulse(pkgAcquire *Owner)
 {
+   pkgAcquireStatus::Pulse(Owner);
+   
    if (Quiet > 0)
       return true;
    
-   pkgAcquireStatus::Pulse(Owner);
-   
-   enum {Long = 0,Medium,Short} Mode = Long;
+   enum {Long = 0,Medium,Short} Mode = Medium;
    
    char Buffer[sizeof(BlankLine)];
    char *End = Buffer + sizeof(Buffer);
@@ -268,15 +268,22 @@ bool AcqTextStatus::MediaChange(string Media,string Drive)
 {
    if (Quiet <= 0)
       cout << '\r' << BlankLine << '\r';
-   ioprintf(cout,_("Media Change: Please insert the disc labeled '%s' in "
-                  "the drive '%s' and press enter\n"),
+   ioprintf(cout,_("Media change: please insert the disc labeled\n"
+                  " '%s'\n"
+                  "in the drive '%s' and press enter\n"),
            Media.c_str(),Drive.c_str());
 
    char C = 0;
+   bool bStatus = true;
    while (C != '\n' && C != '\r')
-      read(STDIN_FILENO,&C,1);
-   
-   Update = true;
-   return true;
+   {
+      int len = read(STDIN_FILENO,&C,1);
+      if(C == 'c' || len <= 0)
+        bStatus = false;
+   }
+
+   if(bStatus)
+      Update = true;
+   return bStatus;
 }
                                                                        /*}}}*/