abrt/0002-abrt-merge-pstoreoops-merge-files-in-descending-orde.patch
Matej Habrnal 66b169ccf2 Fixes related to transition to Python 3 and fix in abrt-merge-pstoreoops
Resolves #1246459

Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
2015-07-24 14:58:43 +02:00

36 lines
1.1 KiB
Diff

From 668014b725660785c43b880e73a9ff723abc0be5 Mon Sep 17 00:00:00 2001
From: "knoha@redhat.com" <knoha@redhat.com>
Date: Fri, 24 Jul 2015 07:56:02 +0200
Subject: [PATCH] abrt-merge-pstoreoops: merge files in descending order
fs/pstore reads the data from kmsg_dump_get_buffer(), which starts at
the end of the kmsg buffer, in a while loop and increases Part no. in
each iteration.
Related: rhbz#1233662
Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
src/hooks/abrt-merge-pstoreoops.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/hooks/abrt-merge-pstoreoops.c b/src/hooks/abrt-merge-pstoreoops.c
index 6fc3109..36f1e0b 100644
--- a/src/hooks/abrt-merge-pstoreoops.c
+++ b/src/hooks/abrt-merge-pstoreoops.c
@@ -64,9 +64,9 @@ int compare_oops_texts(const void *a, const void *b)
return -1;
if (aa->panic_no > bb->panic_no)
return 1;
- if (aa->part_no < bb->part_no)
+ if (aa->part_no > bb->part_no)
return -1;
- return (aa->part_no > bb->part_no);
+ return (aa->part_no < bb->part_no);
}
int main(int argc, char **argv)
--
2.4.6