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:28:51 -0700 |
commit | 9d32d93779638b47df7b087b20148a62bc62f64e (patch) | |
tree | aa87508bdca8f14766afaf794b55ebef24460af4 /meta/recipes-devtools/apt/apt/no-nls-dpkg.patch | |
parent | 654ac86364cdf3b9f616a6019cd8211aef47d7da (diff) | |
download | poky-9d32d93779638b47df7b087b20148a62bc62f64e.tar.gz |
apt: update to 1.0.10.1
(From OE-Core rev: 37c8700560b6da569cdf9d7c306a9aa31dcdf06f)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | --- a/apt-pkg/deb/dpkgpm.cc | ||
4 | +++ b/apt-pkg/deb/dpkgpm.cc | ||
5 | @@ -42,6 +42,12 @@ | ||
6 | #include <apti18n.h> | ||
7 | /*}}}*/ | ||
8 | |||
9 | +#ifdef USE_NLS | ||
10 | +#define _dpkg(x) dgettext("dpkg", x) | ||
11 | +#else | ||
12 | +#define _dpkg(x) x | ||
13 | +#endif | ||
14 | + | ||
15 | using namespace std; | ||
16 | |||
17 | namespace | ||
18 | @@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const | ||
19 | } | ||
20 | |||
21 | // check if its not a follow up error | ||
22 | - const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured"); | ||
23 | + const char *needle = _dpkg("dependency problems - leaving unconfigured"); | ||
24 | if(strstr(errormsg, needle) != NULL) { | ||
25 | std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl; | ||
26 | return; | ||