From 2d2af816d17acf3a99bab9c4d3ebbee8e890dd81c7e4e02c71a5561dbb7a73f8 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Sat, 30 Sep 2017 15:19:04 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=503

---
 fix-diag-sortorder.diff | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/fix-diag-sortorder.diff b/fix-diag-sortorder.diff
index 9d0ca54..9585830 100644
--- a/fix-diag-sortorder.diff
+++ b/fix-diag-sortorder.diff
@@ -1,16 +1,43 @@
-diff --git a/Filter.py b/Filter.py
-index a728115..87b4009 100644
 --- a/Filter.py
 +++ b/Filter.py
-@@ -111,8 +111,9 @@ def printDescriptions(reason):
+@@ -43,15 +43,15 @@ else:
+ 
+ 
+ def printInfo(pkg, reason, *details):
+-    _print("I", pkg, reason, details)
++    _print('I', pkg, reason, details)
+ 
+ 
+ def printWarning(pkg, reason, *details):
+-    _print("W", pkg, reason, details)
++    _print('W', pkg, reason, details)
+ 
+ 
+ def printError(pkg, reason, *details):
+-    _print("E", pkg, reason, details)
++    _print('E', pkg, reason, details)
+ 
+ 
+ def _print(msgtype, pkg, reason, details):
+@@ -111,8 +111,10 @@ def printDescriptions(reason):
  
  
  def _diag_sortkey(x):
 -    xs = x.split()
 -    return (xs[2], xs[1])
 +    xs = x.split(maxsplit=2)
++    # Primary Sort by Category: Info first, then Warnings, then Errors
 +    # ['game.x86_64:', 'W:', 'call-to-mktemp /usr/games/lib/blub\n']
-+    return (xs[2], xs[1], xs[0])
++    return (xs[2], str('IWE'.find(xs[1][0])), xs[0])
  
  
  def printAllReasons():
+@@ -121,7 +123,7 @@ def printAllReasons():
+         return False
+ 
+     global _diagnostic
+-    _diagnostic.sort(key=_diag_sortkey, reverse=True)
++    _diagnostic.sort(key=_diag_sortkey)
+     last_reason = ''
+     for diag in _diagnostic:
+         if Config.info: