apt-pkg/deb/dpkgpm.cc: update string matching for prevent bug reports

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index b9f49365dd090dae1994f09b39e44e0f392c099a..859aff044a0db62e0b0bcd72a2804a88526beba1 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1317,14 +1317,14 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
 
    // do not report out-of-memory failures 
    if(strstr(errormsg, strerror(ENOMEM)) != NULL ||
 
    // do not report out-of-memory failures 
    if(strstr(errormsg, strerror(ENOMEM)) != NULL ||

-      strstr(errormsg, "Cannot allocate memory") != NULL) {
+      strstr(errormsg, "failed to allocate memory") != NULL) {

       std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
       return;
    }
 
    // do not report bugs regarding inaccessible local files
    if(strstr(errormsg, strerror(ENOENT)) != NULL ||
       std::clog << _("No apport report written because the error message indicates a out of memory error") << std::endl;
       return;
    }
 
    // do not report bugs regarding inaccessible local files
    if(strstr(errormsg, strerror(ENOENT)) != NULL ||

-      strstr(errormsg, "Cannot access archive") != NULL) {
+      strstr(errormsg, "cannot access archive") != NULL) {

       std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
       return;
    }
       std::clog << _("No apport report written because the error message indicates an issue on the local system") << std::endl;
       return;
    }

diff --git a/debian/changelog b/debian/changelog
index 7e9295b84f7c6949663ac8b59904dc66fb473062..7b6c51acfc62bb9141e6c5a8386e56002fa2797f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low
 
 apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low
 

+  [ Michael Vogt ]

   * debian/apt.conf.changelog:
     - add missing ";", thanks to Julian Andres Klode
 
   * debian/apt.conf.changelog:
     - add missing ";", thanks to Julian Andres Klode
 

- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 10 Jun 2011 16:11:26 +0200
+  [ Brian Murray ]
+  * apt-pkg/deb/dpkgpm.cc:
+    - updated allocate memory string
+    - cannot access archive string is lowercase
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 15 Jun 2011 14:00:43 -0700

 
 apt (0.8.14.1ubuntu7) oneiric; urgency=low
 
 
 apt (0.8.14.1ubuntu7) oneiric; urgency=low