diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2012-08-07 12:28:56 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2012-10-03 10:13:33 +0300 |
| commit | 97d9da459c19f95c60ae1f4396a2a79a4e616e2c (patch) | |
| tree | 4f205bf843aeaf03fd791e1ff861e2977c1627e5 | |
| parent | 8db02b2bc31d8ce3643032ada610bed812950e24 (diff) | |
| download | rpm-97d9da459c19f95c60ae1f4396a2a79a4e616e2c.tar.gz | |
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.
(cherry picked from commit 227654f30c099bfb1e631fd200f10576b3f58def)
| -rw-r--r-- | lib/verify.c | 3 |
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; } |