Merge lp:~brian-murray/apt/fixed-string-matching into lp:~ubuntu-core-dev/apt/ubuntu

[Brian Murray]

Reviewing apt's bug report handling and dpkg it seems that one error message is 'cannot access archive' as opposed to 'Cannot ...'. This fixes that. Additionally, dpkg doesn't use 'cannot allocate memory' as an error any more, rather it is now 'failed to allocate' memory.

=== modified file 'apt-pkg/deb/dpkgpm.cc'
--- apt-pkg/deb/dpkgpm.cc	2011-06-06 14:36:28 +0000
+++ apt-pkg/deb/dpkgpm.cc	2011-06-15 21:23:32 +0000
@@ -1317,14 +1317,14 @@
 
    // 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 ||
-      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;
    }

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-10 14:12:28 +0000
+++ debian/changelog	2011-06-15 21:23:32 +0000
@@ -1,9 +1,15 @@
 apt (0.8.14.1ubuntu8) UNRELEASED; urgency=low
 
+  [ Michael Vogt ]
   * debian/apt.conf.changelog:
     - add missing ";", thanks to Julian Andres Klode
 
- -- Michael Vogt <[e-mail]>  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 <[e-mail]>  Wed, 15 Jun 2011 14:00:43 -0700
 
 apt (0.8.14.1ubuntu7) oneiric; urgency=low