diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2009-08-24 11:20:27 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2009-08-24 11:20:27 +0200 |
| commit | c6aa14e46842b0059c1648125562793e5edd08ee (patch) | |
| tree | 2910f3ad0ca9f3dde06cbb7187edc42219ac19f2 /apt-pkg | |
| parent | 889053489a8b9b91feeb698fc164446e9b5f9c67 (diff) | |
* apt-pkg/pkgcache.cc:
- do not set internel "needs-configure" state for packages in
triggers-pending state. dpkg will deal with the trigger and
it if does it before we trigger it, dpkg will error out
(LP: #414631)
Diffstat (limited to 'apt-pkg')
| -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 || |