diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-06-16 18:35:32 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-06-16 18:35:32 +0200 |
| commit | 0870363f08b7dbff901cd79a5f80f1700f8965f3 (patch) | |
| tree | 78fc7a3c0a7488cd84acdc4cb1368758ec20bfa7 | |
| parent | bf3778aac96b23b5f584c82b729036b287259848 (diff) | |
| parent | 99289e32e190dbe4465f5c81b8f1cf749d20adeb (diff) | |
* apt-pkg/deb/dpkgpm.cc:
- updated allocate memory string
- cannot access archive string is lowercase
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index b9f49365d..859aff044 100644 --- 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 || - 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; } diff --git a/debian/changelog b/debian/changelog index 7e9295b84..7b6c51acf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <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 |