Files
poky/meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch
Ionut Radu 8d68f1695c 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>
2013-08-03 10:33:08 +01:00

27 lines
753 B
Diff

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;