Merge lp:~brian-murray/aptdaemon/bug-875879 into lp:aptdaemon

[Brian Murray]

In bug 875879 and on errors.ubuntu.com we can see that show_diff in gtk3widgets.py is crashing if there is no match. Its not clear to me why this might happen and we don't know which package is causing this issue but this should avoid the crash.

[Martin Pitt (pitti)]

Seems fine to me, thank you!

review: Approve

=== modified file 'aptdaemon/gtk3widgets.py'
--- aptdaemon/gtk3widgets.py	2012-05-12 02:09:10 +0000
+++ aptdaemon/gtk3widgets.py	2012-09-05 23:42:19 +0000
@@ -1094,6 +1094,8 @@
         for line in difflib.unified_diff(from_lines, to_lines, lineterm=""):
             if line.startswith("@@"):
                 match = re.match(self.REGEX_RANGE, line)
+                if not match:
+                    continue
                 line_number = int(match.group("from_start"))
                 if line_number > 1:
                     insert_tagged_text(iter, self.ELLIPSIS, "default")

=== modified file 'aptdaemon/gtkwidgets.py'
--- aptdaemon/gtkwidgets.py	2012-05-08 18:50:57 +0000
+++ aptdaemon/gtkwidgets.py	2012-09-05 23:42:19 +0000
@@ -1036,6 +1036,8 @@
         for line in difflib.unified_diff(from_lines, to_lines, lineterm=""):
             if line.startswith("@@"):
                 match = re.match(self.REGEX_RANGE, line)
+                if not match:
+                    continue
                 line_number = int(match.group("from_start"))
                 if line_number > 1:
                     self.buffer.insert_with_tags_by_name(iter, self.ELLIPSIS,