diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-01-25 12:01:16 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-01-25 12:01:16 +0200 |
| commit | ee655d91a2dfd5e8863dca582077d1bd65cb240b (patch) | |
| tree | 0a7818995911a8d1504179ac556e0d8b5471ea7c /lib | |
| parent | 86c2aa8cd638be53d35a22b4fc1302be434b8851 (diff) | |
| download | rpm-ee655d91a2dfd5e8863dca582077d1bd65cb240b.tar.gz rpm-ee655d91a2dfd5e8863dca582077d1bd65cb240b.tar.bz2 rpm-ee655d91a2dfd5e8863dca582077d1bd65cb240b.zip | |
Permit conflicting ghost files
Patch from Pascal Rigaux
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rpmfi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/rpmfi.c b/lib/rpmfi.c index bb0ccbf08..657d334ba 100644 --- 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) { |