diff options
author | Ionut Radu <ionutx.radu@intel.com> | 2013-07-31 16:58:51 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-03 10:33:08 +0100 |
commit | 8d68f1695c7a57bb5b3d5635a48cf2987d589cd3 (patch) | |
tree | 8f69b6da2f7a8aac251fce5d47826673b1ea615c /meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch | |
parent | 338b0e7b0ff24aac2a81775dacb523b45ee83fbd (diff) | |
download | poky-8d68f1695c7a57bb5b3d5635a48cf2987d589cd3.tar.gz |
apt: Upgrade from 0.9.8.2 to 0.9.9.4
makerace.patch: adapted to the new version
(From OE-Core rev: ad69f62e42c131dcccd33b0e39c61a431f581bea)
Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch')
-rw-r--r-- | meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch new file mode 100644 index 0000000000..a0996d4d44 --- /dev/null +++ b/meta/recipes-devtools/apt/apt-0.9.9.4/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; | ||