diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:51:21 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:51:21 +0000 |
| commit | c7c1b0f62edbefb01efce67f64bd44397be36946 (patch) | |
| tree | 5d3df8b575da338c9045c0523628957ae57cdfe8 /apt-pkg | |
| parent | 7deed45913546487c5162c3600a31e614e68a05a (diff) | |
Small bug fixes
Author: jgg
Date: 1998-11-06 02:52:20 GMT
Small bug fixes
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/acquire.cc | 5 | ||||
| -rw-r--r-- | apt-pkg/init.cc | 4 | ||||
| -rw-r--r-- | apt-pkg/pkgcache.cc | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 16adf3ae2..ed64c5e5f 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: acquire.cc,v 1.8 1998/11/05 07:21:40 jgg Exp $ +// $Id: acquire.cc,v 1.9 1998/11/06 02:52:20 jgg Exp $ /* ###################################################################### Acquire - File Acquiration @@ -472,8 +472,6 @@ bool pkgAcquire::Queue::Cycle() if (Items == 0 || Workers == 0) return true; - cout << "Cylce for " << Name << endl; - // Look for a queable item QItem *I = Items; for (; I != 0; I = I->Next) @@ -486,7 +484,6 @@ bool pkgAcquire::Queue::Cycle() I->Worker = Workers; I->Owner->Status = pkgAcquire::Item::StatFetching; - cout << "Item has been queued!" << endl; return Workers->QueueItem(I); } /*}}}*/ diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index e504e4a14..e0ab46821 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: init.cc,v 1.11 1998/11/05 07:42:03 jgg Exp $ +// $Id: init.cc,v 1.12 1998/11/06 02:52:21 jgg Exp $ /* ###################################################################### Init - Initialize the package library @@ -54,7 +54,7 @@ bool pkgInitialize(Configuration &Cnf) // Read an alternate config file const char *Cfg = getenv("APT_CONFIG"); - if (Cfg != 0 && FileExists(FName) == true) + if (Cfg != 0 && FileExists(Cfg) == true) Res &= ReadConfigFile(Cnf,Cfg); if (Res == false) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index a73cb410b..99cd11413 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: pkgcache.cc,v 1.12 1998/10/20 04:33:14 jgg Exp $ +// $Id: pkgcache.cc,v 1.13 1998/11/06 02:52:22 jgg Exp $ /* ###################################################################### Package Cache - Accessor code for the cache @@ -204,6 +204,10 @@ void pkgCache::PkgIterator::operator ++(int) /* By this we mean if it is either cleanly installed or cleanly removed. */ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const { + if (Pkg->InstState == pkgCache::State::ReInstReq || + Pkg->InstState == pkgCache::State::HoldReInstReq) + return NeedsUnpack; + if (Pkg->CurrentState == pkgCache::State::UnPacked || Pkg->CurrentState == pkgCache::State::HalfConfigured) return NeedsConfigure; |