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