summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/deb/dpkgpm.cc5
-rw-r--r--debian/changelog8
2 files changed, 10 insertions, 3 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 8123a7aba..5ed6482fa 100644
--- 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 5bd5222cc..12b3b5ddc 100644
--- 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