diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:54:01 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:54:01 +0000 |
| commit | 024d1123bf43ec616da66c2481a8ee877e00b8cb (patch) | |
| tree | c5d8d4061ea4fefd99dcd3674ef7046f35803542 /cmdline | |
| parent | b826eb9e018b9abccea67bfa08c075a342ebe59b (diff) | |
Havocs cancel patch
Author: jgg
Date: 1999-06-13 05:06:40 GMT
Havocs cancel patch
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/acqprogress.cc | 8 | ||||
| -rw-r--r-- | cmdline/acqprogress.h | 4 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/cmdline/acqprogress.cc b/cmdline/acqprogress.cc index 5e88d3cd0..d6031ad0a 100644 --- a/cmdline/acqprogress.cc +++ b/cmdline/acqprogress.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acqprogress.cc,v 1.14 1999/06/06 05:52:37 jgg Exp $ +// $Id: acqprogress.cc,v 1.15 1999/06/13 05:06:40 jgg Exp $ /* ###################################################################### Acquire Progress - Command line progress meter @@ -132,10 +132,10 @@ void AcqTextStatus::Stop() /* This draws the current progress. Each line has an overall percent meter and a per active item status meter along with an overall bandwidth and ETA indicator. */ -void AcqTextStatus::Pulse(pkgAcquire *Owner) +bool AcqTextStatus::Pulse(pkgAcquire *Owner) { if (Quiet > 0) - return; + return true; pkgAcquireStatus::Pulse(Owner); @@ -244,6 +244,8 @@ void AcqTextStatus::Pulse(pkgAcquire *Owner) BlankLine[strlen(Buffer)] = 0; Update = false; + + return true; } /*}}}*/ // AcqTextStatus::MediaChange - Media need to be swapped /*{{{*/ diff --git a/cmdline/acqprogress.h b/cmdline/acqprogress.h index 8cee3cd29..8b8da04a1 100644 --- a/cmdline/acqprogress.h +++ b/cmdline/acqprogress.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acqprogress.h,v 1.3 1998/12/04 21:16:53 jgg Exp $ +// $Id: acqprogress.h,v 1.4 1999/06/13 05:06:40 jgg Exp $ /* ###################################################################### Acquire Progress - Command line progress meter @@ -29,7 +29,7 @@ class AcqTextStatus : public pkgAcquireStatus virtual void Start(); virtual void Stop(); - void Pulse(pkgAcquire *Owner); + bool Pulse(pkgAcquire *Owner); AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet); }; diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index a40b8a4c7..69e986978 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: apt-get.cc,v 1.64 1999/06/06 05:52:37 jgg Exp $ +// $Id: apt-get.cc,v 1.65 1999/06/13 05:06:40 jgg Exp $ /* ###################################################################### apt-get - Cover for dpkg @@ -590,7 +590,7 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,bool Saftey = // Run it if (_config->FindB("APT::Get::No-Download",false) == false) - if( Fetcher.Run() == false) + if( Fetcher.Run() == pkgAcquire::Failed) return false; // Print out errors @@ -679,7 +679,7 @@ bool DoUpdate(CommandLine &) } // Run it - if (Fetcher.Run() == false) + if (Fetcher.Run() == pkgAcquire::Failed) return false; // Clean out any old list files @@ -1217,7 +1217,7 @@ bool DoSource(CommandLine &CmdL) } // Run it - if (Fetcher.Run() == false) + if (Fetcher.Run() == pkgAcquire::Failed) return false; // Print error messages |