Update tools/acpi_extract.py to handle iasl 20130117 release.

The latest iasl release produces "lst" output with "number:  " instead
of "number....".  Update the tool to support both formats.

Reported-by: Bo Yang <boyang@suse.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
(cherry picked from commit f396871e3df9da14c65ab24a5a881674e06150a9)

diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py
index 167a322a3c9b24b4fe8bf21ec64fc906aa787cab..d0346b5f278c1934686c07c0a8357ecd8306dd7f 100755 (executable)
--- a/tools/acpi_extract.py
+++ b/tools/acpi_extract.py
@@ -203,12 +203,12 @@ for line in fileinput.input():
     lineno = lineno + 1
     debug = "input line %d: %s" % (lineno, line)
     #ASL listing: space, then line#, then ...., then code
-    pasl = re.compile('^\s+([0-9]+)\.\.\.\.\s*')
+    pasl = re.compile('^\s+([0-9]+)(:\s\s|\.\.\.\.)\s*')
     m = pasl.search(line)
     if (m):
         add_asl(lineno, pasl.sub("", line));
     # AML listing: offset in hex, then ...., then code
-    paml = re.compile('^([0-9A-Fa-f]+)\.\.\.\.\s*')
+    paml = re.compile('^([0-9A-Fa-f]+)(:\s\s|\.\.\.\.)\s*')
     m = paml.search(line)
     if (m):
         add_aml(m.group(1), paml.sub("", line))