]> git.saurik.com Git - apt.git/commitdiff
* apt-pkg/deb/dpkgpm.cc:
authorMichael Vogt <michael.vogt@ubuntu.com>
Tue, 5 Aug 2008 08:09:42 +0000 (10:09 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Tue, 5 Aug 2008 08:09:42 +0000 (10:09 +0200)
  - fix uninitialized variable that caused no apport reports
    to be written sometimes (thanks to Matt Zimmerman)

apt-pkg/deb/dpkgpm.cc
debian/changelog

index 74f672dd95aa8c6072dd03283dc6f8f00cfa0c36..ede1673bca5ded224cd1e13c5998d01d51e881ba 100644 (file)
@@ -47,7 +47,7 @@ using namespace std;
 /* */
 pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
    : pkgPackageManager(Cache), dpkgbuf_pos(0),
-     term_out(NULL), PackagesDone(0), PackagesTotal(0)
+     term_out(NULL), PackagesDone(0), PackagesTotal(0), pkgFailures(0)
 {
 }
                                                                        /*}}}*/
@@ -946,11 +946,17 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
    FILE *report;
 
    if (_config->FindB("Dpkg::ApportFailureReport",true) == false)
+   {
+      std::clog << "configured to not write apport reports" << std::endl;
       return;
+   }
 
    // only report the first error
    if(pkgFailures > _config->FindI("APT::Apport::MaxReports", 3))
+   {
+      std::clog << _("No apport report written because MaxReports is reached already") << std::endl;
       return;
+   }
 
    // get the pkgname and reportfile
    pkgname = flNotDir(pkgpath);
index e21260ffb344e461c1d9bd1b20f24ddb1bcf9290..fb5fc9f77233430012a5f25221267ebeb318a3a5 100644 (file)
@@ -1,3 +1,11 @@
+apt (0.7.14ubuntu4) intrepid; urgency=low
+
+  * apt-pkg/deb/dpkgpm.cc:
+    - fix uninitialized variable that caused no apport reports
+      to be written sometimes (thanks to Matt Zimmerman)
+
+ --
+
 apt (0.7.14ubuntu3) intrepid; urgency=low
 
   [ Otavio Salvador ]