summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch
diff options
context:
space:
mode:
authorIonut Radu <ionutx.radu@intel.com>2013-06-27 13:07:13 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-02 22:23:46 +0100
commit70a26477ce93f0083cab98d1aeeb98ca6ec34343 (patch)
tree37de15b16e5b740ca920ada192ef32e8469d4638 /meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch
parentfcea0bb9733fe5b8bd003e477a845b5612a5d960 (diff)
downloadpoky-70a26477ce93f0083cab98d1aeeb98ca6ec34343.tar.gz
apt: Updated from 0.9.8.1 to 0.9.8.2
(From OE-Core rev: 1500b4e7f6adec612efbdebad6a08a1efeeda7b6) Signed-off-by: Ionut Radu <ionutx.radu@intel.com> [sgw - fixed apt-native checksums] 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.8.2/no-nls-dpkg.patch')
-rw-r--r--meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch b/meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch
new file mode 100644
index 0000000000..f1dd5fd05b
--- /dev/null
+++ b/meta/recipes-devtools/apt/apt-0.9.8.2/no-nls-dpkg.patch
@@ -0,0 +1,24 @@
1--- a/apt-pkg/deb/dpkgpm.cc
2+++ b/apt-pkg/deb/dpkgpm.cc
3@@ -42,6 +42,12 @@
4 #include <apti18n.h>
5 /*}}}*/
6
7+#ifdef USE_NLS
8+#define _dpkg(x) dgettext("dpkg", x)
9+#else
10+#define _dpkg(x) x
11+#endif
12+
13 using namespace std;
14
15 namespace
16@@ -1279,7 +1285,7 @@ void pkgDPkgPM::WriteApportReport(const
17 }
18
19 // check if its not a follow up error
20- const char *needle = dgettext("dpkg", "dependency problems - leaving unconfigured");
21+ const char *needle = _dpkg("dependency problems - leaving unconfigured");
22 if(strstr(errormsg, needle) != NULL) {
23 std::clog << _("No apport report written because the error message indicates its a followup error from a previous failure.") << std::endl;
24 return;