From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 7 Mar 2007 16:46:28 +0000 (+0000)
Subject: - from openpkg -- makes %{error:foo} in macros fatal
X-Git-Tag: auto/th/rpm-build-macros-1_379-1~8
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=ccfcbb0718b62b0db68746fdb4fbf53859a61d62;hp=30f8d830224b0ca9978ac078780994ee150228f9

- from openpkg -- makes %{error:foo} in macros fatal

Changed files:
    rpm-error-fatal.patch -> 1.1
---

diff --git a/rpm-error-fatal.patch b/rpm-error-fatal.patch
new file mode 100644
index 0000000..9ae5ee2
--- /dev/null
+++ b/rpm-error-fatal.patch
@@ -0,0 +1,17 @@
++---------------------------------------------------------------------------
+| Make sure that an %{error:<msg>} macro really stops further
+| processing. Else it would be nothing more than a %{warn:<msg>}.
++---------------------------------------------------------------------------
+Index: rpmio/macro.c
+--- rpmio/macro.c	15 May 2003 13:42:01 -0000	1.1.1.7
++++ rpmio/macro.c	22 Jan 2004 21:42:32 -0000	1.2
+@@ -1329,7 +1337,7 @@
+ 	    STREQ("error", f, fn)) {
+ 		int waserror = 0;
+ 		if (STREQ("error", f, fn))
+-			waserror = 1;
++			waserror = 1, rc = 1;
+ 		if (g < ge)
+ 			doOutput(mb, waserror, g, gn);
+ 		else
+