Blame enable-postin-scripts-error.diff

ef651c
--- lib/rpmscript.c
ef651c
+++ lib/rpmscript.c
ffd279
@@ -390,7 +390,7 @@ rpmRC rpmScriptRun(rpmScript script, int
Bernhard M. Wiedemann eb41fd
     if (script == NULL) return RPMRC_OK;
Bernhard M. Wiedemann 1250f9
 
Bernhard M. Wiedemann eb41fd
     ARGV_t args = NULL;
Bernhard M. Wiedemann eb41fd
-    rpmlogLvl lvl = (script->flags & RPMSCRIPT_FLAG_CRITICAL) ?
Bernhard M. Wiedemann eb41fd
+    rpmlogLvl lvl = (rpmScriptFlags(script) & RPMSCRIPT_FLAG_CRITICAL) ?
Bernhard M. Wiedemann eb41fd
 		    RPMLOG_ERR : RPMLOG_WARNING;
Bernhard M. Wiedemann eb41fd
     rpmRC rc;
Bernhard M. Wiedemann eb41fd
     int script_type = RPMSCRIPTLET_FORK | RPMSCRIPTLET_EXEC;
ffd279
@@ -637,5 +637,8 @@ rpmscriptTypes rpmScriptType(rpmScript s
Bernhard M. Wiedemann eb41fd
 
Bernhard M. Wiedemann eb41fd
 rpmscriptFlags rpmScriptFlags(rpmScript script)
Bernhard M. Wiedemann eb41fd
 {
Bernhard M. Wiedemann eb41fd
-    return (script != NULL) ? script->flags : 0;
Bernhard M. Wiedemann eb41fd
+    rpmscriptFlags flags = (script != NULL) ? script->flags : 0;
Bernhard M. Wiedemann eb41fd
+    if (script && script->tag == RPMTAG_POSTIN && rpmExpandNumeric("%{_fail_on_postinstall_errors}"))
Bernhard M. Wiedemann eb41fd
+	flags |= RPMSCRIPT_FLAG_CRITICAL;
Bernhard M. Wiedemann eb41fd
+    return flags;
Bernhard M. Wiedemann eb41fd
 }
ef651c
--- macros.in
ef651c
+++ macros.in
ffd279
@@ -1293,5 +1293,10 @@ end
ffd279
 %{expand:%__scm_setup_%{__scm} %{!-v:-q}}\
ffd279
 %{!-N:%autopatch %{-v} %{-p:-p%{-p*}}}
Bernhard M. Wiedemann 1250f9
 
ffd279
+# Should errors in %post scriptlet be propagated as errors?
Bernhard M. Wiedemann 1250f9
+#
Bernhard M. Wiedemann 1250f9
+# Note: set to 1 for legacy compatibility.
Bernhard M. Wiedemann 1250f9
+%_fail_on_postinstall_errors  0
Bernhard M. Wiedemann 1250f9
+
Bernhard M. Wiedemann 1250f9
 # \endverbatim
Bernhard M. Wiedemann 1250f9
 #*/