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;
+ }
}
--- 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);
+
/* 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;
+ }
+ }
- 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)) {
+
+ /* 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;
+ }