mirror of
https://git.yoctoproject.org/poky
synced 2026-03-19 21:59:42 +01:00
98e78f2e49
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: a70103a6e400caaa87e1d36a7e59be7f3059a3bb) Signed-off-by: Ross Burton <ross.burton@intel.com> 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>
29 lines
897 B
Diff
29 lines
897 B
Diff
Upstream-Status: Pending
|
|
|
|
Index: apt-1.2.24/apt-pkg/deb/dpkgpm.cc
|
|
===================================================================
|
|
--- apt-1.2.24.orig/apt-pkg/deb/dpkgpm.cc
|
|
+++ apt-1.2.24/apt-pkg/deb/dpkgpm.cc
|
|
@@ -54,6 +54,12 @@
|
|
#include <apti18n.h>
|
|
/*}}}*/
|
|
|
|
+#ifdef USE_NLS
|
|
+#define _dpkg(x) dgettext("dpkg", x)
|
|
+#else
|
|
+#define _dpkg(x) x
|
|
+#endif
|
|
+
|
|
using namespace std;
|
|
|
|
APT_PURE static string
|
|
@@ -1703,7 +1709,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;
|