From: Michael Vogt <mvo@debian.org>
Date: Fri, 28 Aug 2009 16:54:02 +0000 (+0200)
Subject: * apt-pkg/pkgcache.cc:
X-Git-Tag: 0.7.23.1~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/b74d2d3af3238210bfafe57562d3670327918cd9?hp=f710c76235d47f9f9ea692cd042147cc43949954

* 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)
---

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