* apt-pkg/deb/dpkgpm.cc:

  - add APT::Apport::MaxReports to limit the maximum number
    of reports generated in a single run (default to 3)

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 8123a7aba96c36437d2b76e9e26f2e1496b8406b..5ed6482fa5489a9b4ba9a3f2e32815203c093a36 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -906,9 +906,8 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
    if (_config->FindB("Dpkg::ApportFailureReport",true) == false)
       return;
 
-   // only report the first error if we are in StopOnError=false mode
-   // to prevent bogus reports
-   if((_config->FindB("Dpkg::StopOnError",true) == false) && pkgFailures > 1)
+   // only report the first error
+   if(pkgFailures > _config->FindI("APT::Apport::MaxReports", 3))
       return;
 
    // get the pkgname and reportfile

diff --git a/debian/changelog b/debian/changelog
index 5bd5222cc000424a580d6d4c69c40be8fa0a3181..12b3b5ddcae75fdb64f99e5872a70ea7c7cc451c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.7.9ubuntu6) hardy; urgency=low
+
+  * apt-pkg/deb/dpkgpm.cc:
+    - add APT::Apport::MaxReports to limit the maximum number
+      of reports generated in a single run (default to 3)
+
+ --
+
 apt (0.7.9ubuntu5) hardy; urgency=low
 
   * Merged apt-authentication-reliabilty branch. This means