SOURCES: rpm-error-fatal.patch (NEW) - from openpkg -- makes %{err...

glen glen at pld-linux.org
Wed Mar 7 17:46:33 CET 2007


Author: glen                         Date: Wed Mar  7 16:46:33 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from openpkg -- makes %{error:foo} in macros fatal

---- Files affected:
SOURCES:
   rpm-error-fatal.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/rpm-error-fatal.patch
diff -u /dev/null SOURCES/rpm-error-fatal.patch:1.1
--- /dev/null	Wed Mar  7 17:46:33 2007
+++ SOURCES/rpm-error-fatal.patch	Wed Mar  7 17:46:28 2007
@@ -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
+
================================================================


More information about the pld-cvs-commit mailing list