diff options
| author | Ionut Radu <ionutx.radu@intel.com> | 2013-07-31 16:58:51 +0300 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-08-02 08:01:39 -0700 |
| commit | ad69f62e42c131dcccd33b0e39c61a431f581bea (patch) | |
| tree | 1f27e87776f0c5b72b94dd4bcd0b9e07e04b2f51 /meta/recipes-devtools/apt/apt-0.9.9.4/no-nls-dpkg.patch | |
| parent | 2158003ea4b9879fdef34488462cc59450638218 (diff) | |
| download | openembedded-core-ad69f62e42c131dcccd33b0e39c61a431f581bea.tar.gz openembedded-core-ad69f62e42c131dcccd33b0e39c61a431f581bea.tar.bz2 openembedded-core-ad69f62e42c131dcccd33b0e39c61a431f581bea.zip | |
apt: Upgrade from 0.9.8.2 to 0.9.9.4
makerace.patch: adapted to the new version
Signed-off-by: Ionut Radu <ionutx.radu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 @@ +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; |