Attachment 113368 Details for Bug 155256 – Ignore %ghost and %ghost file conflicts

[patch] Ignore %ghost and %ghost file conflicts

rpm-4.4-ghost-conflicts.patch (text/plain), 1021 bytes, created by Paul Nasrat on 2005-04-19 15:55:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Nasrat

Created: 2005-04-19 15:55:39 UTC

Size: 1021 bytes

patch

obsolete

>Index: lib/transaction.c
>===================================================================
>RCS file: /cvs/devel/rpm/lib/transaction.c,v
>retrieving revision 1.315.2.2
>diff -u -r1.315.2.2 transaction.c
>--- lib/transaction.c	10 Feb 2005 09:04:06 -0000	1.315.2.2
>+++ lib/transaction.c	19 Apr 2005 15:52:36 -0000
>@@ -165,6 +165,7 @@
>     for (i = 0; i < sharedCount; i++, shared++) {
> 	int otherFileNum, fileNum;
> 	int isCfgFile;
>+        int isGhostFile;
> 
> 	otherFileNum = shared->otherFileNum;
> 	(void) rpmfiSetFX(otherFi, otherFileNum);
>@@ -177,6 +178,7 @@
> 	FColor &= tscolor;
> 
> 	isCfgFile = ((rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG);
>+	isGhostFile = ((rpmfiFFlags(otherFi) & RPMFILE_GHOST) && (rpmfiFFlags(fi) & RPMFILE_GHOST));
> 
> #ifdef	DYING
> 	/* XXX another tedious segfault, assume file state normal. */
>@@ -186,6 +188,9 @@
> 
> 	if (XFA_SKIPPING(fi->actions[fileNum]))
> 	    continue;
>+
>+        if (isGhostFile)
>+            continue;
> 
> 	if (rpmfiCompare(otherFi, fi)) {
> 	    int rConflicts;

Actions: View | Diff

Attachments on bug 155256: 113368 | 115544