| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 3 | Index: apt-1.2.24/apt-pkg/deb/dpkgpm.cc |
| 4 | =================================================================== |
| 5 | --- apt-1.2.24.orig/apt-pkg/deb/dpkgpm.cc |
| 6 | +++ apt-1.2.24/apt-pkg/deb/dpkgpm.cc |
| 7 | @@ -54,6 +54,12 @@ |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 8 | #include <apti18n.h> |
| 9 | /*}}}*/ |
| 10 | |
| 11 | +#ifdef USE_NLS |
| 12 | +#define _dpkg(x) dgettext("dpkg", x) |
| 13 | +#else |
| 14 | +#define _dpkg(x) x |
| 15 | +#endif |
| 16 | + |
| 17 | using namespace std; |
| 18 | |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 19 | APT_PURE static string |
| 20 | @@ -1703,7 +1709,7 @@ void pkgDPkgPM::WriteApportReport(const |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 21 | } |
| 22 | |
| 23 | // check if its not a follow up error |
| 24 | - const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); |
| 25 | + const char *needle = _dpkg("dependency problems - leaving unconfigured"); |
| 26 | if(strstr(errormsg, needle) != NULL) { |
| 27 | std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; |
| 28 | return; |