projects
/
platform
/
upstream
/
rpm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86c2aa8
)
Permit conflicting ghost files
author
Panu Matilainen
<pmatilai@redhat.com>
Fri, 25 Jan 2008 10:01:16 +0000
(12:01 +0200)
committer
Panu Matilainen
<pmatilai@redhat.com>
Fri, 25 Jan 2008 10:01:16 +0000
(12:01 +0200)
Patch from Pascal Rigaux
lib/rpmfi.c
patch
|
blob
|
history
diff --git
a/lib/rpmfi.c
b/lib/rpmfi.c
index
bb0ccbf
..
657d334
100644
(file)
--- a/
lib/rpmfi.c
+++ b/
lib/rpmfi.c
@@
-449,6
+449,9
@@
int rpmfiCompare(const rpmfi afi, const rpmfi bfi)
rpmFileTypes awhat = rpmfiWhatis(rpmfiFMode(afi));
rpmFileTypes bwhat = rpmfiWhatis(rpmfiFMode(bfi));
+ if ((rpmfiFFlags(afi) & RPMFILE_GHOST) ||
+ (rpmfiFFlags(bfi) & RPMFILE_GHOST)) return 0;
+
if (awhat != bwhat) return 1;
if (awhat == LINK) {