* 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 2a9756c453becc538fd89f444498873cf1cced2a..b0ce6e5989728f351b5428beddfade624525d37c 100644 (file)
--- 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 ||
       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::TriggersAwaited

-       Pkg->CurrentState == pkgCache::State::TriggersPending)
+      //Pkg->CurrentState == pkgCache::State::TriggersPending)

       return NeedsConfigure;
    
    if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||
       return NeedsConfigure;
    
    if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||

diff --git a/debian/changelog b/debian/changelog
index 2131b807760848e556f823026f8764c92d8a96f5..6692191d14a9420a2d1bcab47e3c6cdd288f38c7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ apt (0.7.22.3) UNRELEASED; urgency=low
       and '{http,ftp}_proxy' environment variables are used only if options
       mentioned above are not specified.
       (Closes: #445985, #157759, #320184, #365880, #479617)
       and '{http,ftp}_proxy' environment variables are used only if options
       mentioned above are not specified.
       (Closes: #445985, #157759, #320184, #365880, #479617)

+  
+  [ 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>  Wed, 19 Aug 2009 11:14:15 +0200
 
 
  -- Michael Vogt <mvo@debian.org>  Wed, 19 Aug 2009 11:14:15 +0200