SOURCES: rpm-error-fatal.patch - adjust for rpm 4.4.2

[glen]

Author: glen                         Date: Wed Mar  7 16:56:35 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjust for rpm 4.4.2

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

---- Diffs:

================================================================
Index: SOURCES/rpm-error-fatal.patch
diff -u SOURCES/rpm-error-fatal.patch:1.1 SOURCES/rpm-error-fatal.patch:1.2
--- SOURCES/rpm-error-fatal.patch:1.1	Wed Mar  7 17:46:28 2007
+++ SOURCES/rpm-error-fatal.patch	Wed Mar  7 17:56:29 2007
@@ -2,16 +2,14 @@
 | 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 @@
+--- rpm-4.4.2/rpmio/macro.c~	2007-03-07 18:50:42.754005171 +0200
++++ rpm-4.4.2/rpmio/macro.c	2007-03-07 18:55:51.040958707 +0200
+@@ -1380,7 +1380,7 @@
  	    STREQ("error", f, fn)) {
  		int waserror = 0;
  		if (STREQ("error", f, fn))
 -			waserror = 1;
 +			waserror = 1, rc = 1;
- 		if (g < ge)
+ 		if (g != NULL && g < ge)
  			doOutput(mb, waserror, g, gn);
  		else
-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-error-fatal.patch?r1=1.1&r2=1.2&f=u