diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-01-21 14:14:28 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-01-21 14:27:14 +0200 |
| commit | 0f3eb238bb54d585d2cc8524c21bd09ebeddd499 (patch) | |
| tree | d97cc4fa5218cde661eb4d69db52d793009835d0 | |
| parent | 6d9218e3adf0cb313653b9a6717df2c1ce4a230e (diff) | |
| download | rpm-4.7.x.tar.gz | |
Really fix verification error code to not depend on verbosity (RhBug:557101)rpm-4.7.x
- earlier fix from commit 6649c23cac5823d0c7415df5cfd66e5aac5eebd2 was
broken as it could reset return code to zero after detecting errors
earlier
(cherry picked from commit 04ad4b1155ec4b082fbac425a575a0ba05337ab1)
| -rw-r--r-- | lib/verify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/verify.c b/lib/verify.c index 523cb69ef..4dd3774cc 100644 --- a/lib/verify.c +++ b/lib/verify.c @@ -349,7 +349,7 @@ static int verifyHeader(QVA_t qva, const rpmts ts, Header h) static const char *const aok = "."; static const char *const unknown = "?"; - ec = (verifyResult != 0); + if (verifyResult) ec = 1; #define _verify(_RPMVERIFY_F, _C) \ ((verifyResult & _RPMVERIFY_F) ? _C : aok) |