- added rpm-double_check_unpackaged_subdirs patch (do a strict check when Bloom filte...

[packages/rpm.git] / rpm-libmagic-locale.patch

diff --git a/rpm-libmagic-locale.patch b/rpm-libmagic-locale.patch
index f0184271d4c92bc7c659e87c985c7ac71cca368d..d83f577d6c3554236d9ae4c5dfbecbd1bd43221f 100644 (file)
--- a/rpm-libmagic-locale.patch
+++ b/rpm-libmagic-locale.patch
@@ -1,9 +1,10 @@
 --- rpm-4.5/rpmio/rpmmg.c.org  2012-02-29 16:32:05.655058968 +0100
 +++ rpm-4.5/rpmio/rpmmg.c      2012-02-29 16:36:22.430972834 +0100
-@@ -1114,7 +1114,28 @@
+@@ -118,7 +118,29 @@
            /*@fallthrough@*/
        case URL_IS_UNKNOWN:
        default:
++          {
 +              char *old_ctype = setlocale(LC_CTYPE, NULL);
 +              char *old_collate = setlocale(LC_COLLATE, NULL);
 +
@@ -29,3 +30,11 @@
            /* XXX HACK: libmagic compiled without <pcreposix.h> spews here. */
            if (t == NULL) {
                const char * msg = magic_error(mg->ms);
+@@ -147,6 +176,7 @@
+                   rpmlog(RPMLOG_ERR, _("magic_file(ms, %s) failed: %s\n"),
+                           (fn ? fn : "(nil)"), msg);
+           }
++          }
+           break;
+       }
+     }