current/SOURCES/rpm-allow-conflicting-ghost-files.patch

From 0bf391f94e85851d35a7adb4f1fcff17253825fe Mon Sep 17 00:00:00 2001
From: unknown author <cooker@mandrivalinux.org>
Date: Mon, 5 Jan 2009 13:29:57 +0000
Subject: [PATCH 14/35] allow conflicting ghost files

---
 lib/rpmfi.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index 6055a24..76f6626 100644
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -472,6 +472,9 @@ int rpmfiCompare(const rpmfi afi, const rpmfi bfi)
     if ((rpmfiFFlags(afi) & RPMFILE_GHOST) ||
        (rpmfiFFlags(bfi) & RPMFILE_GHOST)) return 0;
 
+    if ((rpmfiFFlags(afi) & RPMFILE_GHOST) ||
+       (rpmfiFFlags(bfi) & RPMFILE_GHOST)) return 0;
+
     if (awhat != bwhat) return 1;
 
     if (awhat == LINK) {
-- 
1.6.1.3

1	From 0bf391f94e85851d35a7adb4f1fcff17253825fe Mon Sep 17 00:00:00 2001
2	From: unknown author <cooker@mandrivalinux.org>
3	Date: Mon, 5 Jan 2009 13:29:57 +0000
4	Subject: [PATCH 14/35] allow conflicting ghost files
5
6	---
7	lib/rpmfi.c \| 3 +++
8	1 files changed, 3 insertions(+), 0 deletions(-)
9
10	diff --git a/lib/rpmfi.c b/lib/rpmfi.c
11	index 6055a24..76f6626 100644
12	--- a/lib/rpmfi.c
13	+++ b/lib/rpmfi.c
14	@@ -472,6 +472,9 @@ int rpmfiCompare(const rpmfi afi, const rpmfi bfi)
15	if ((rpmfiFFlags(afi) & RPMFILE_GHOST) \|\|
16	(rpmfiFFlags(bfi) & RPMFILE_GHOST)) return 0;
17
18	+ if ((rpmfiFFlags(afi) & RPMFILE_GHOST) \|\|
19	+ (rpmfiFFlags(bfi) & RPMFILE_GHOST)) return 0;
20	+
21	if (awhat != bwhat) return 1;
22
23	if (awhat == LINK) {
24	--
25	1.6.1.3
26