summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/pkgcache.cc10
-rw-r--r--debian/changelog3
2 files changed, 10 insertions, 3 deletions
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 8eb62089a..385d247ea 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -274,9 +274,13 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
return NeedsUnpack;
if (Pkg->CurrentState == pkgCache::State::UnPacked ||
- Pkg->CurrentState == pkgCache::State::HalfConfigured ||
- Pkg->CurrentState == pkgCache::State::TriggersPending ||
- Pkg->CurrentState == pkgCache::State::TriggersAwaited)
+ 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::TriggersAwaited
+ Pkg->CurrentState == pkgCache::State::TriggersPending)
return NeedsConfigure;
if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||
diff --git a/debian/changelog b/debian/changelog
index f778fbe1d..6dea85f25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,9 @@ apt (0.7.21) UNRELEASED; urgency=low
* [ABI break] merge support for http redirects, thanks to
Jeff Licquia and Anthony Towns
* [ABI break] use int for the package IDs (thanks to Steve Cotton)
+ * apt-pkg/pkgcache.cc:
+ - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+ state (LP: #322955)
[ Dereck Wonnacott ]
* apt-ftparchive might write corrupt Release files (LP: #46439)