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

[RedSingularity]

=== modified file 'bugpatterns.xml'
--- bugpatterns.xml	2011-09-13 15:00:16 +0000
+++ bugpatterns.xml	2011-09-13 22:56:42 +0000
@@ -2103,6 +2103,12 @@
 	<re key="Traceback">DatabaseCorruptError: Data ran out unexpectedly when reading posting list.</re>
     </pattern>
 
+    <pattern url="https://launchpad.net/bugs/844961">
+	<re key="Package">^zeitgeist</re>
+	<re key="OriginalTitle">zeitgeist-daemon crashed with DatabaseCorruptError in _check_index_and_start_worker\(\): Data ran out unexpectedly when reading posting list.</re>
+	<re key="Traceback">DatabaseCorruptError: Data ran out unexpectedly when reading posting list.</re>
+    </pattern>
+
 <!-- Converted from libxcb.xml -->
     <pattern url="http://launchpad.net/bugs/507062">
         <re key="AssertionMessage">_XAllocID:.*ret.*inval_id</re>
 
=== modified file 'test-local'
--- test-local	2011-09-12 18:19:23 +0000
+++ test-local	2011-09-13 22:56:42 +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)