Merge lp:~redsingularity/apport/bugpattern-848739 into lp:~ubuntu-bugcontrol/apport/ubuntu-bugpatterns

[RedSingularity]

[Brian Murray (brian-murray)]

bug 848739 is actually a duplicate of bug 832745 but I'll fix this up.

[Brian Murray (brian-murray)]

And it looks like there is already a bug pattern for 832745 so I'm going to disapprove this and look into how 848739 got through. Thanks though!

review: Disapprove

Unmerged revisions

337. By Tim <tim@Alpha> on 2011-09-13

Added pattern for bug 848739.

336. By Tim <tim@Alpha> on 2011-09-13

Added Pattern for bug 848739.

=== modified file 'bugpatterns.xml'
--- bugpatterns.xml	2011-09-13 15:00:16 +0000
+++ bugpatterns.xml	2011-09-13 17:10:25 +0000
@@ -1992,6 +1992,12 @@
 	<re key="Traceback">TypeError: glib.markup_escape_text\(\) takes at most 1 argument \(2 given\)</re>
     </pattern>
 
+    <pattern url="https://launchpad.net/bugs/848739">
+        <re key="Package">^update-manager </re>
+        <re key="Title">update-manager crashed with TypeError in confirmChanges\(\): glib.markup_escape_text\(\) takes at most 1 argument \(2 given\)</re>
+        <re key="Traceback">TypeError: glib.markup_escape_text\(\) takes at most 1 argument \(2 given\)</re>
+    </pattern>
+
 <!-- Converted from update-notifier.xml -->
 
     <pattern url="https://launchpad.net/bugs/403192">

=== modified file 'test-local'
--- test-local	2011-09-12 18:19:23 +0000
+++ test-local	2011-09-13 17:10:25 +0000
@@ -4,25 +4,16 @@
 
 import apport
 from apport.crashdb import get_crashdb
-from launchpadlib.launchpad import Launchpad
-
-def match_bug(bugnumber):
-    db = get_crashdb(None)
-    report = db.download(bugnumber)
-    match = report.search_bug_patterns('bugpatterns.xml')
-
-    if match:
-        print 'LP: #%s: Matched bug pattern: %s' % (bugnumber, match )
-    else:
-        print 'LP: #%s: No match' % bugnumber
-
-lp = Launchpad.login_anonymously('apport', 'production')
 
 if len(sys.argv) != 2:
     print >> sys.stderr, 'Usage: %s <.crash file or bug number>' % sys.argv[0]
     sys.exit(1)
 
-if not sys.argv[1].isdigit():
+if sys.argv[1].isdigit():
+    db = get_crashdb(None)
+    report = db.download(sys.argv[1])
+    #report.write(open('/tmp/report.crash', 'w'))
+else:
     report = apport.Report()
     try:
         f = open(sys.argv[1])
@@ -31,29 +22,12 @@
         sys.exit(1)
     report.load(f)
     f.close()
-    match = report.search_bug_patterns('bugpatterns.xml')
-
-    if match:
-        print 'LP: #%s: Matched bug pattern: %s' % ( sys.argv[1], match )
-        sys.exit(0)
-    else:
-        print 'LP: #%s: No match' % sys.argv[1]
-        sys.exit(1)
-else:
-    match_bug(sys.argv[1])
-
-    bug = lp.bugs[sys.argv[1]]
-    # if bug is a duplicate - call this for parent
-    if bug.duplicate_of:
-        dupe = bug.duplicate_of.id
-        print 'LP: #%s is a duplicate of ....' % bug.id
-        match_bug(dupe)
-    if bug.duplicates:
-        print "Checking duplicate bugs..."
-        for duplicate in bug.duplicates:
-            # Skip if not an apport bug
-            if 'apport-crash' in duplicate.tags or \
-                'apport-package' in duplicate.tags:
-                match_bug(duplicate.id)
-
+
+match = report.search_bug_patterns('.')
+
+if match:
+    print 'LP: #%s: Matched bug pattern: %s' % ( sys.argv[1], match )
     sys.exit(0)
+else:
+    print 'LP: #%s: No match' % sys.argv[1]
+    sys.exit(1)