summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/acquire.cc6
-rw-r--r--debian/changelog3
2 files changed, 8 insertions, 1 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 74bdaf85b..7800dc8d0 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: acquire.cc,v 1.49 2001/05/27 04:28:37 jgg Exp $
+// $Id: acquire.cc,v 1.50 2004/03/17 05:17:11 mdz Exp $
/* ######################################################################
Acquire - File Acquiration
@@ -87,7 +87,11 @@ pkgAcquire::~pkgAcquire()
void pkgAcquire::Shutdown()
{
while (Items.size() != 0)
+ {
+ if (Items[0]->Status == Item::StatFetching)
+ Items[0]->Status = Item::StatError;
delete Items[0];
+ }
while (Queues != 0)
{
diff --git a/debian/changelog b/debian/changelog
index b397742aa..7d4fd17b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ apt (0.5.24) unstable; urgency=low
* Regenerate .pot file (Closes: #237892)
* Updated Polish translation from Marcin Owsiany <porridge@debian.org>
(Closes: #238333)
+ * In pkgAcquire::Shutdown(), set the status of fetching items to
+ StatError to avoid a sometimes large batch of error messages
+ (Closes: #234685)
--