Blame rpm-4.4.2-ghost-conflicts.patch
|
Paul Nasrat |
2c259d |
--- rpm-4.4.2/lib/transaction.c.ghostconflicts 2005-06-11 15:37:34.000000000 -0400
|
|
Paul Nasrat |
2c259d |
+++ rpm-4.4.2/lib/transaction.c 2005-11-28 13:25:25.000000000 -0500
|
|
Paul Nasrat |
2c259d |
@@ -165,6 +165,7 @@
|
|
Paul Nasrat |
2c259d |
for (i = 0; i < sharedCount; i++, shared++) {
|
|
Paul Nasrat |
2c259d |
int otherFileNum, fileNum;
|
|
Paul Nasrat |
2c259d |
int isCfgFile;
|
|
Paul Nasrat |
2c259d |
+ int isGhostFile;
|
|
Paul Nasrat |
2c259d |
|
|
Paul Nasrat |
2c259d |
otherFileNum = shared->otherFileNum;
|
|
Paul Nasrat |
2c259d |
(void) rpmfiSetFX(otherFi, otherFileNum);
|
|
Paul Nasrat |
2c259d |
@@ -177,6 +178,7 @@
|
|
Paul Nasrat |
2c259d |
FColor &= tscolor;
|
|
Paul Nasrat |
2c259d |
|
|
Paul Nasrat |
2c259d |
isCfgFile = ((rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG);
|
|
Paul Nasrat |
2c259d |
+ isGhostFile = ((rpmfiFFlags(otherFi) & RPMFILE_GHOST) && (rpmfiFFlags(fi) & RPMFILE_GHOST));
|
|
Paul Nasrat |
2c259d |
|
|
Paul Nasrat |
2c259d |
#ifdef DYING
|
|
Paul Nasrat |
2c259d |
/* XXX another tedious segfault, assume file state normal. */
|
|
Paul Nasrat |
2c259d |
@@ -187,6 +189,9 @@
|
|
Paul Nasrat |
2c259d |
if (XFA_SKIPPING(fi->actions[fileNum]))
|
|
Paul Nasrat |
2c259d |
continue;
|
|
Paul Nasrat |
2c259d |
|
|
Paul Nasrat |
2c259d |
+ if (isGhostFile)
|
|
Paul Nasrat |
2c259d |
+ continue;
|
|
Paul Nasrat |
2c259d |
+
|
|
Paul Nasrat |
2c259d |
if (rpmfiCompare(otherFi, fi)) {
|
|
Paul Nasrat |
2c259d |
int rConflicts;
|
|
Paul Nasrat |
2c259d |
|