Call "Dequeue()" for items in AbortTransaction() to fix race

The pkgAcquire::Run() code works uses a while(ToFetch > 0) loop
over the items queued for fetching. This means that we need to
Deqeueue the item if we call AbortTransaction() to avoid a hang.

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index ba1669de0dc889dcaafe86cfeed717ad13f6f496..f684e81f182f0661620fc238e938160879ad80a2 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -1547,7 +1547,10 @@ void pkgAcqMetaBase::AbortTransaction()
          std::clog << "  Cancel: " << (*I)->DestFile << std::endl;
       // the transaction will abort, so stop anything that is idle
       if ((*I)->Status == pkgAcquire::Item::StatIdle)
          std::clog << "  Cancel: " << (*I)->DestFile << std::endl;
       // the transaction will abort, so stop anything that is idle
       if ((*I)->Status == pkgAcquire::Item::StatIdle)

+      {

          (*I)->Status = pkgAcquire::Item::StatDone;
          (*I)->Status = pkgAcquire::Item::StatDone;

+         (*I)->Dequeue();
+      }

    }
    Transaction.clear();
 }
    }
    Transaction.clear();
 }

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 4b4ef5fca8f56c0b5646ff3b07864248ce1d4cdb..d6eca3e5071c5a50956cc6e30a87cfa6cb5f736a 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -63,6 +63,8 @@ class pkgAcqMetaBase;
  */
 class pkgAcquire::Item : public WeakPointable
 {  
  */
 class pkgAcquire::Item : public WeakPointable
 {  

+   friend pkgAcqMetaBase;
+

    void *d;
 
    protected:
    void *d;
 
    protected: