diff options
| author | Michael Vogt <mvo@debian.org> | 2009-08-28 18:54:02 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2009-08-28 18:54:02 +0200 |
| commit | b74d2d3af3238210bfafe57562d3670327918cd9 (patch) | |
| tree | c5001425dd196c2330acd9c905d98ad4a059790d | |
| parent | f710c76235d47f9f9ea692cd042147cc43949954 (diff) | |
| parent | c6aa14e46842b0059c1648125562793e5edd08ee (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)
| -rw-r--r-- | apt-pkg/pkgcache.cc | 12 | ||||
| -rw-r--r-- | debian/changelog | 13 |
2 files changed, 18 insertions, 7 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 || diff --git a/debian/changelog b/debian/changelog index e351198c5..5fff5fdc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.7.23.1) UNRELEASED; urgency=low + + [ Michael Vogt ] + * 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) + + -- Michael Vogt <mvo@debian.org> Fri, 28 Aug 2009 18:53:20 +0200 + apt (0.7.23) unstable; urgency=low [ Eugene V. Lyubimkin ] @@ -7,7 +18,7 @@ apt (0.7.23) unstable; urgency=low and '{http,ftp}_proxy' environment variables are used only if options mentioned above are not specified. (Closes: #445985, #157759, #320184, #365880, #479617) - + [ David Kalnischkies ] * cmdline/apt-get.cc: - add APT::Get::HideAutoRemove=small to display only a short line |