summaryrefslogtreecommitdiff
path: root/lib/verify.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2012-02-28 10:31:28 +0200
committerPanu Matilainen <pmatilai@redhat.com>2012-02-28 10:36:10 +0200
commit4e207bfdfce434a6484babc14fe86aeadeec5329 (patch)
treef12429f52a3c85abd8c9463e3bad2d4655f1590d /lib/verify.c
parent2a4333c18e0000031ed1d542ba7a6fffe1360c08 (diff)
downloadrpm-4e207bfdfce434a6484babc14fe86aeadeec5329.tar.gz
rpm-4e207bfdfce434a6484babc14fe86aeadeec5329.tar.bz2
rpm-4e207bfdfce434a6484babc14fe86aeadeec5329.zip
Unbreak rpm -V output (RhBug:797964)
- Commit ac0ab016a5ec31e65eb0c0910a5a6f1199aae3e7 unintentionally changed the order of the problems shown in verify strings due to a dumb oversight (greetings to self, duh). In other words, this fixes a verify output regression in rpm >= 4.9.x by restoring the long-standing (and documented) order of the verify output chars. - Also fix the testcase which unfortunately was only added after the output-changing commit so it didn't catch the breakage either :-/
Diffstat (limited to 'lib/verify.c')
-rw-r--r--lib/verify.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/verify.c b/lib/verify.c
index 35612fe4b..1edb27f16 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -292,14 +292,14 @@ char * rpmVerifyString(uint32_t verifyResult, const char *pad)
{
char *fmt = NULL;
rasprintf(&fmt, "%s%s%s%s%s%s%s%s%s",
- _verifyfile(RPMVERIFY_FILEDIGEST, "5", pad),
_verify(RPMVERIFY_FILESIZE, "S", pad),
- _verifylink(RPMVERIFY_LINKTO, "L", pad),
- _verify(RPMVERIFY_MTIME, "T", pad),
+ _verify(RPMVERIFY_MODE, "M", pad),
+ _verifyfile(RPMVERIFY_FILEDIGEST, "5", pad),
_verify(RPMVERIFY_RDEV, "D", pad),
+ _verifylink(RPMVERIFY_LINKTO, "L", pad),
_verify(RPMVERIFY_USER, "U", pad),
_verify(RPMVERIFY_GROUP, "G", pad),
- _verify(RPMVERIFY_MODE, "M", pad),
+ _verify(RPMVERIFY_MTIME, "T", pad),
_verify(RPMVERIFY_CAPS, "P", pad));
return fmt;