diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2009-08-29 12:45:32 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2009-08-29 12:45:32 +0200 |
| commit | b43af876ed0901eabfb7fe93276eb9272cacf22d (patch) | |
| tree | 28be7f5d599a2ff2c3c376e158fe8b2f57049cac /apt-pkg/pkgcache.cc | |
| parent | 86d9e9635a23c7ecfe2de7f440a6acce320067bc (diff) | |
| parent | 6abe26994fd82bef9bc357055d1dc4feee261a4d (diff) | |
merge with lp:~mvo/apt/debian-sid with the bugfix release 0.7.23.1 in it.
Diffstat (limited to 'apt-pkg/pkgcache.cc')
| -rw-r--r-- | apt-pkg/pkgcache.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 2a9756c45..b0ce6e598 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -275,13 +275,13 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const return NeedsUnpack; if (Pkg->CurrentState == pkgCache::State::UnPacked || - Pkg->CurrentState == pkgCache::State::HalfConfigured || - //we don't need to care for triggers awaiting packages - //dpkg will deal with them automatically when the - //trigger pending action is run (those packages are usually - //in half-configured or triggers-pending state) + Pkg->CurrentState == pkgCache::State::HalfConfigured) + // we leave triggers alone complettely. dpkg deals with + // them in a hard-to-predict manner and if they get + // resolved by dpkg before apt run dpkg --configure on + // the TriggersPending package dpkg returns a error //Pkg->CurrentState == pkgCache::State::TriggersAwaited - Pkg->CurrentState == pkgCache::State::TriggersPending) + //Pkg->CurrentState == pkgCache::State::TriggersPending) return NeedsConfigure; if (Pkg->CurrentState == pkgCache::State::HalfInstalled || |