Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 9e7b72ee0c994609975981e135fc18d0387aefb6 Mon Sep 17 00:00:00 2001 |
| 2 | From: jbj <jbj> |
| 3 | Date: Wed, 14 May 2014 21:19:41 +0000 |
| 4 | Subject: [PATCH] - verify: fix: broken logic for %ghost avoidance (Mark |
| 5 | Hatle). |
| 6 | |
| 7 | Upstream-Status: Backport |
| 8 | |
| 9 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 10 | --- |
| 11 | CHANGES | 1 + |
| 12 | lib/verify.c | 3 +-- |
| 13 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | Index: rpm-5.4.14/CHANGES |
| 16 | =================================================================== |
| 17 | --- rpm-5.4.14.orig/CHANGES |
| 18 | +++ rpm-5.4.14/CHANGES |
| 19 | @@ -1,3 +1,5 @@ |
| 20 | + - jbj: verify: fix: broken logic for %ghost avoidance (Mark Hatle). |
| 21 | + |
| 22 | 5.4.13 -> 5.4.14: |
| 23 | - mooney: use __sun instead of __sun__ in #define (lp#1243472). |
| 24 | - mooney: rpmconstant: ensure linkage w Oracle Studio 12.3 (lp#1243469). |
| 25 | Index: rpm-5.4.14/lib/verify.c |
| 26 | =================================================================== |
| 27 | --- rpm-5.4.14.orig/lib/verify.c |
| 28 | +++ rpm-5.4.14/lib/verify.c |
| 29 | @@ -588,8 +588,7 @@ uint32_t fc = rpmfiFC(fi); |
| 30 | continue; |
| 31 | |
| 32 | /* If not verifying %ghost, skip ghost files. */ |
| 33 | - /* XXX the broken!!! logic disables %ghost queries always. */ |
| 34 | - if (!(FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST))) |
| 35 | + if (!FF_ISSET(qva->qva_fflags, GHOST) && FF_ISSET(fflags, GHOST)) |
| 36 | continue; |
| 37 | |
| 38 | /* Gather per-file data into a carrier. */ |