Quellcode durchsuchen

* apt-pkg/deb/dpkgpm.cc:
- fix uninitialized variable that caused no apport reports
to be written sometimes (thanks to Matt Zimmerman)

Michael Vogt vor 18 Jahren
Ursprung
Commit
ff38d63b19
2 geänderte Dateien mit 15 neuen und 1 gelöschten Zeilen
  1. 7 1
      apt-pkg/deb/dpkgpm.cc
  2. 8 0
      debian/changelog

+ 7 - 1
apt-pkg/deb/dpkgpm.cc

@@ -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);

+ 8 - 0
debian/changelog

@@ -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 ]