SOURCES (rpm-4_5): rpm-installbeforeerase.patch - ignore loop messages for ...

glen glen at pld-linux.org
Mon Oct 27 13:51:22 CET 2008


Author: glen                         Date: Mon Oct 27 12:51:22 2008 GMT
Module: SOURCES                       Tag: rpm-4_5
---- Log message:
- ignore loop messages for pkgs in whiteout lists on erase too

---- Files affected:
SOURCES:
   rpm-installbeforeerase.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/rpm-installbeforeerase.patch
diff -u SOURCES/rpm-installbeforeerase.patch:1.1.2.1 SOURCES/rpm-installbeforeerase.patch:1.1.2.2
--- SOURCES/rpm-installbeforeerase.patch:1.1.2.1	Mon Oct 27 13:41:10 2008
+++ SOURCES/rpm-installbeforeerase.patch	Mon Oct 27 13:51:16 2008
@@ -4,11 +4,17 @@
  	- glen: do not skip %clean from spec file
  	- robert: install rpmdeps and debugedit to pkglibdir as on HEAD
  	- jbj: fix: python ts.hdrFromFdno(fdno) segfault.
-Index: rpm/lib/depends.c
-RCS File: /v/rpm/cvs/rpm/lib/depends.c,v
-rcsdiff -q -kk '-r1.327.2.9' '-r1.327.2.10' -u '/v/rpm/cvs/rpm/lib/depends.c,v' 2>/dev/null
---- ./lib/depends.c	2008/06/06 14:50:46	1.327.2.9
-+++ ./lib/depends.c	2008/10/26 18:29:50	1.327.2.10
+--- rpm-4.5/lib/depends.c~	2008/10/26 18:29:50	1.327.2.10
++++ rpm-4.5/lib/depends.c	2008-10-27 14:42:52.984295775 +0200
+@@ -1936,7 +1936,7 @@
+ 	return 0;
+ 
+     /* Avoid certain dependency relations. */
+-    if (teType == TR_ADDED && ignoreDep(ts, p, q))
++    if (ignoreDep(ts, p, q))
+ 	return 0;
+ 
+     /* Avoid redundant relations. */
 @@ -2191,6 +2191,25 @@
  	}
        }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-installbeforeerase.patch?r1=1.1.2.1&r2=1.1.2.2&f=u



More information about the pld-cvs-commit mailing list