* apt-pkg/pkgcache.cc:

  - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
    state (LP: #322955)
  - do not unlink files in partial/ (thanks to robbiew)

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 8eb62089a8369af4c23f89b07045a71804ed5169..4fbf42c4bb6c4f82dd919ad8fbe2647eb58df06d 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -275,8 +275,12 @@ pkgCache::PkgIterator::OkState pkgCache::PkgIterator::State() const
    
    if (Pkg->CurrentState == pkgCache::State::UnPacked ||
        Pkg->CurrentState == pkgCache::State::HalfConfigured ||
    
    if (Pkg->CurrentState == pkgCache::State::UnPacked ||
        Pkg->CurrentState == pkgCache::State::HalfConfigured ||

-       Pkg->CurrentState == pkgCache::State::TriggersPending ||
-       Pkg->CurrentState == pkgCache::State::TriggersAwaited)
+      //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 ||
       return NeedsConfigure;
    
    if (Pkg->CurrentState == pkgCache::State::HalfInstalled ||

diff --git a/debian/changelog b/debian/changelog
index 23a0514f64dfc0cb35b98d224deb66d96b389f30..0e2d3afe6a3fb5c814df8b16015bcff99e2a4192 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,8 +32,12 @@ apt (0.7.20.2ubuntu1) jaunty; urgency=low
   * cmdline/apt-get.cc:
     - default to "false" for the "APT::Get::Build-Dep-Automatic"
       option (follow debian here)
   * cmdline/apt-get.cc:
     - default to "false" for the "APT::Get::Build-Dep-Automatic"
       option (follow debian here)

+  * apt-pkg/pkgcache.cc:
+    - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+      state (LP: #322955)

   * methods/https.cc:
     - add Acquire::https::AllowRedirect support
   * methods/https.cc:
     - add Acquire::https::AllowRedirect support

+    - do not unlink files in partial/ (thanks to robbiew)

 
   [ Dereck Wonnacott ]
   * Clarify the --help for 'purge' (LP: #243948)
 
   [ Dereck Wonnacott ]
   * Clarify the --help for 'purge' (LP: #243948)

diff --git a/methods/https.cc b/methods/https.cc
index 87de545898b528ef1cdcd8a2a519977beb49b5c6..8bf44b52a995b994f6ba252aa386d1d39d171859 100644 (file)
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -253,7 +253,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    // cleanup
    if(success != 0) 
    {
    // cleanup
    if(success != 0) 
    {

-      unlink(File->Name().c_str());

       _error->Error("%s", curl_errorstr);
       Fail();
       return true;
       _error->Error("%s", curl_errorstr);
       Fail();
       return true;