summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-02-03 12:24:31 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-02-03 12:24:31 +0100
commit71a9e7cf8b7c78950939bb866701d8445fe5ba4c (patch)
tree9c7fef0fdd1a9315431e92ecf459c4f4a777da9e /apt-pkg
parentcb3cc4806c6585757377dfd54b7ce880ae1f99c7 (diff)
* apt-pkg/pkgcache.cc:
- do not run "dpkg --configure pkg" if pkg is in trigger-awaited state (LP: #322955)
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/pkgcache.cc10
1 files changed, 7 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 ||