diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-05 14:29:58 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 09:04:11 -0700 |
| commit | 37c8700560b6da569cdf9d7c306a9aa31dcdf06f (patch) | |
| tree | fc8d85613c2168d51e3ea00f69035677a0c7ebce /meta/recipes-devtools/apt/apt/no-nls-dpkg.patch | |
| parent | 82d85bdee7707896cbd432b143eb0ac22c8e3451 (diff) | |
| download | openembedded-core-contrib-37c8700560b6da569cdf9d7c306a9aa31dcdf06f.tar.gz | |
apt: update to 1.0.10.1
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools/apt/apt/no-nls-dpkg.patch')
| -rw-r--r-- | meta/recipes-devtools/apt/apt/no-nls-dpkg.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch new file mode 100644 index 0000000000..a0996d4d44 --- /dev/null +++ b/meta/recipes-devtools/apt/apt/no-nls-dpkg.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +--- a/apt-pkg/deb/dpkgpm.cc ++++ b/apt-pkg/deb/dpkgpm.cc +@@ -42,6 +42,12 @@ + #include <apti18n.h> + /*}}}*/ + ++#ifdef USE_NLS ++#define _dpkg(x) dgettext("dpkg", x) ++#else ++#define _dpkg(x) x ++#endif ++ + using namespace std; + + namespace +@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const + } + + // check if its not a follow up error +- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); ++ const char *needle = _dpkg("dependency problems - leaving unconfigured"); + if(strstr(errormsg, needle) != NULL) { + std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; + return; |