summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2012-08-07 12:28:56 +0300
committerPanu Matilainen <pmatilai@redhat.com>2012-08-07 12:28:56 +0300
commit227654f30c099bfb1e631fd200f10576b3f58def (patch)
treee4a6975ecbfd1131ff345db48f8caed8c9e0e2fd
parentd6add031f1e63cc228cc5002df06a52c76479560 (diff)
downloadrpm-227654f30c099bfb1e631fd200f10576b3f58def.tar.gz
rpm-227654f30c099bfb1e631fd200f10576b3f58def.tar.bz2
rpm-227654f30c099bfb1e631fd200f10576b3f58def.zip
Verify files from non-installed packages again (RhBug:826589)
- Verifying files against the originating, non-installed package can be useful sometimes, eg if rpmdb is broken or cannot be trusted. Of course such verification will give false positives on files that were intentionally skipped during installation (nodocs, wrong color, netshared...), that can't be helped. - This restores the former behavior that was erroneously changed in commit adbd484372cb38aca5aca3c6dba3b2ca9cae93d1 while "fixing" an unhandled enumeration in the switch. Doh.
-rw-r--r--lib/verify.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/verify.c b/lib/verify.c
index 1edb27f16..3dcec10f7 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -71,7 +71,6 @@ int rpmVerifyFile(const rpmts ts, const rpmfi fi,
switch (rpmfiFState(fi)) {
case RPMFILE_STATE_NETSHARED:
case RPMFILE_STATE_NOTINSTALLED:
- case RPMFILE_STATE_MISSING:
return 0;
break;
case RPMFILE_STATE_REPLACED:
@@ -87,6 +86,8 @@ int rpmVerifyFile(const rpmts ts, const rpmfi fi,
RPMVERIFY_MTIME | RPMVERIFY_RDEV);
break;
case RPMFILE_STATE_NORMAL:
+ /* File from a non-installed package, try to verify nevertheless */
+ case RPMFILE_STATE_MISSING:
break;
}