From 41ba38574ce73dfb52de1ccdd649387700efebf7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 4 Sep 2012 08:23:20 +0200 Subject: [PATCH] fixed bits missing during update to rpm5 --- rpm-helperEVR-noassert.patch | 2 +- rpm-libmagic-locale.patch | 11 ++++++++++- rpm-postun-nofail.patch | 2 +- rpm-unglobal.patch | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/rpm-helperEVR-noassert.patch b/rpm-helperEVR-noassert.patch index fff4a84..17a5146 100644 --- a/rpm-helperEVR-noassert.patch +++ b/rpm-helperEVR-noassert.patch @@ -6,7 +6,7 @@ EVR = pav[i]; -assert(EVR != NULL); + if(EVR == NULL) { -+ rpmMessage(RPMMESS_ERROR, _("%s helper returned empty version info for %s, omitting\n"), nsdep, N); ++ rpmlog(RPMLOG_ERR, _("%s helper returned empty version info for %s, omitting\n"), nsdep, N); + continue; + } } diff --git a/rpm-libmagic-locale.patch b/rpm-libmagic-locale.patch index f018427..d83f577 100644 --- 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 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; + } + } diff --git a/rpm-postun-nofail.patch b/rpm-postun-nofail.patch index e02ab7c..2c9b8c0 100644 --- a/rpm-postun-nofail.patch +++ b/rpm-postun-nofail.patch @@ -7,7 +7,7 @@ - rc = (rpmRC) rpmpsmNext(psm, PSM_SCRIPT); - if (rc) break; + if (rpmpsmNext(psm, PSM_SCRIPT)) -+ rpmMessage(RPMMESS_VERBOSE, _("Ignoring failed %%postun scriptlet\n")); ++ rpmlog(RPMLOG_INFO, _("Ignoring failed %%postun scriptlet\n")); } if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) { diff --git a/rpm-unglobal.patch b/rpm-unglobal.patch index 7dbbcb5..2e0d9dd 100644 --- a/rpm-unglobal.patch +++ b/rpm-unglobal.patch @@ -29,7 +29,7 @@ + + /* Names must start with alphabetic or _ and be at least 3 chars */ + if (!((c = *n) && (xisalpha(c) || c == '_') && (ne - n) > 2)) { -+ rpmError(RPMERR_BADSPEC, ++ rpmlog(RPMLOG_ERR, + _("Macro %%%s has illegal name (%%unglobal)\n"), n); + return se; + } -- 2.44.0