commit 6017b22459d2534c461e7b0c8875c0575296de95
author Jonatan Antoni <jonatan.antoni@arm.com> Thu May 17 16:05:45 2018 +0200
committer Jonatan Antoni <jonatan.antoni@arm.com> Thu May 17 16:05:45 2018 +0200
tree 621cff8fe06c5d3184a37994aa3509a3f4a50ac8
parent 5090f89eb599db65b0bffeaff3e0d0ff3b2aa9ef

Enhanced pack linter configuration to handle escaped XML tags in revision history.

Change-Id: I77cb938481dc8f87f0d4d1e29076de3ef5a64d4a

linter.py

diff --git a/linter.py b/linter.py
index 11c7665..2873116 100644
--- a/linter.py
+++ b/linter.py
@@ -27,8 +27,8 @@
     if not v:
       v = self._regex_(file, ".*\$Revision:\s+([vV])?([0-9]+[.][0-9]+([.][0-9]+)?).*", 2)
     return v
-    
-  def _revhistory_(self, file, skip = 0):
+  
+  def _cmtable_(self, file, skip = 0):
     table = ""
     dump = False
     with open(file, 'r') as f:
@@ -39,11 +39,17 @@
           else:
             dump = True
         if dump:
-          table += l.replace("<br>", "\\n")
+          table += l.replace("<br>", "\\n").replace("\\<", "&lt;").replace("\\>", "&gt;")
           if l.strip() == "</table>":
             break
     if table:
       table = lxml.etree.fromstring(table)
+      return table
+    return None
+    
+  def _revhistory_(self, file, skip = 0):
+    table = self._cmtable_(file, skip)
+    if table is not None:
       m = re.match("[Vv]?(\d+.\d+(.\d+)?)", table[1][0].text)
       if m:
         return SemanticVersion(m.group(1))
@@ -91,21 +97,11 @@
     if not component:
       return None
       
-    table = ""
-    dump = False
-    with open(file, 'r') as f:
-      for l in f:
-        if not dump and l.strip() == "<table class=\"cmtable\" summary=\"Revision History\">":
-          dump = True
-        if dump:
-          table += l.replace("<br>", "\\n")
-          if l.strip() == "</table>":
-            dump = False
-    table = lxml.etree.fromstring(table)
-    m = re.search(re.escape(component)+"\s+[Vv]?(\d+.\d+(.\d+)?)", table[1][1].text, re.MULTILINE)
-    if m:
-      return SemanticVersion(m.group(1))
-      
+    table = self._cmtable_(file)
+    if table is not None:
+      m = re.search(re.escape(component)+"\s+[Vv]?(\d+.\d+(.\d+)?)", table[1][1].text, re.MULTILINE)
+      if m:
+        return SemanticVersion(m.group(1))
     return None
     
   def dap_txt(self, file, skip = 0):