From ba8529ce322af67d2e6fa5386b2db224f007729b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Fri, 29 Jun 2018 15:35:13 +0200
Subject: [PATCH] daca2-report: Remove column data from diff-warnings because
 there are changes I want to ignore

---
 tools/daca2-report.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/daca2-report.py b/tools/daca2-report.py
index a5b7d5e9d..2327d775d 100644
--- a/tools/daca2-report.py
+++ b/tools/daca2-report.py
@@ -48,14 +48,15 @@ def summaryHtml(style, font, severity, categories, totalNumber):
 def getWarnings(filename):
     ftp = ''
     warnings = []
-    pattern = re.compile(r'.*: (error|warning|style|performance|portability):.* \[([a-zA-Z0-9_\\-]+)\]')
+    pattern = re.compile(r'(.*:[0-9]+):[0-9]+: (error|warning|style|performance|portability)(:.* \[[a-zA-Z0-9_\\-]+\])')
     for line in open(filename, 'rt'):
         line = line.strip('\r\n')
         if line.startswith('ftp://'):
             ftp = line
             continue
-        if pattern.match(line):
-            warnings.append(ftp + '\n' + line)
+        res = pattern.match(line)
+        if res:
+            warnings.append(ftp + '\n' + res.group(1) + ': ' + res.group(2) + res.group(3))
     return warnings
 
 def getUnique(warnings1, warnings2):