Merge lp:~gothicx/apport/ignore_obsolete_packages into lp:~apport-hackers/apport/trunk

[Marco Rodrigues]

Unmerged revisions

1597. By Marco Rodrigues on 2009-09-14

APPORT_IGNORE_OBSOLETE_PACKAGES env variable not working 100%

=== modified file 'NEWS'
--- NEWS	2009-09-12 15:29:19 +0000
+++ NEWS	2009-09-13 21:23:17 +0000
@@ -6,7 +6,6 @@
 Bug fixes:
  - hookutils.py, attach_hardware(): Do not attach empty Pccardctl*.
  - apport/report.py, add_gdb_info(): Do not throw away stderr from gdb.
- - data/general-hooks/parse_segv.py: Handle arithmetic wrapping correctly.
 
 1.9 (2009-09-08)
 ----------------

=== modified file 'apport/crashdb_impl/launchpad.py'
--- apport/crashdb_impl/launchpad.py	2009-09-04 18:48:00 +0000
+++ apport/crashdb_impl/launchpad.py	2009-09-12 12:02:56 +0000
@@ -171,7 +171,11 @@
                 hdr['Subscribers'] = 'apport'
         if report.has_key('Tags'):
             hdr['Tags'] += ' ' + report['Tags']
-
+     
+        # Add Distro ID and Codename as Tags to better LP filtering
+        # FIXME: ugly Ubuntu specific hack until LP has a real crash db
+        hdr['Tags'] += ' ' + report['DistroRelease'].split()[0].lower + ' ' + report['DistroRelease'].split()[2]
+            
         # write MIME/Multipart version into temporary file
         mime = tempfile.TemporaryFile()
         report.write_mime(mime, extra_headers=hdr)

=== modified file 'apport/report.py'
--- apport/report.py	2009-09-10 03:10:16 +0000
+++ apport/report.py	2009-09-12 12:02:56 +0000
@@ -217,13 +217,13 @@
         '''Add operating system information.
 
         This adds:
-        - DistroRelease: lsb_release -sir output
+        - DistroRelease: lsb_release -sirc output
         - Architecture: system architecture in distro specific notation
         - Uname: uname -srm output
         - NonfreeKernelModules: loaded kernel modules which are not free (if
             there are none, this field will not be present)
         '''
-        p = subprocess.Popen(['lsb_release', '-sir'], stdout=subprocess.PIPE,
+        p = subprocess.Popen(['lsb_release', '-sirc'], stdout=subprocess.PIPE,
             stderr=subprocess.PIPE, close_fds=True)
         self['DistroRelease'] = p.communicate()[0].strip().replace('\n', ' ')
 

=== modified file 'apport/ui.py'
--- apport/ui.py	2009-09-09 14:57:01 +0000
+++ apport/ui.py	2009-09-13 21:23:17 +0000
@@ -250,7 +250,8 @@
                 return
 
             # check unreportable flag
-            if self.report.has_key('UnreportableReason'):
+            if self.report.has_key('UnreportableReason') and \
+                'APPORT_IGNORE_OBSOLETE_PACKAGES' not in os.environ:
                 self.ui_info_message(_('Problem in %s') % self.report['Package'].split()[0],
                     _('The problem cannot be reported:\n\n%s') %
                     self.report['UnreportableReason'])

=== modified file 'backends/packaging-apt-dpkg.py'
--- backends/packaging-apt-dpkg.py	2009-09-08 12:16:54 +0000
+++ backends/packaging-apt-dpkg.py	2009-09-12 22:55:19 +0000
@@ -189,9 +189,9 @@
 
         for line in open(sumfile):
             try:
-                # ignore lines with NUL bytes (happens, LP#96050)
+                # ignore lines with NULL bytes (happens, LP#96050)
                 if '\0' in line:
-                    print >> sys.stderr, 'WARNING:', sumfile, 'contains NUL character, ignoring line'
+                    print >> sys.stderr, 'WARNING:', sumfile, 'contains NULL character, ignoring line'
                     continue
                 words  = line.split()
                 if not words:
@@ -458,7 +458,7 @@
                 candidate_version = c[pkg].candidateVersion
             else:
                 candidate_version = c[pkg].candidate.version
-            if ver and candidate_version != ver:
+            if ver and candidate_version != ver and ver is not 'None':
                 if not pkg.endswith('-dbgsym'):
                     outdated += '%s: installed version %s, latest version: %s\n' % (
                         pkg, ver, candidate_version)

=== modified file 'data/general-hooks/parse_segv.py'
--- data/general-hooks/parse_segv.py	2009-09-13 01:14:15 +0000
+++ data/general-hooks/parse_segv.py	2009-09-13 21:23:17 +0000
@@ -177,7 +177,6 @@
                 val = int(text)
             return val
 
-        # (%ebx, %ecx, 4) style
         value = 0
         if len(parts)>1:
             parens = parts[1][0:-1]
@@ -194,13 +193,7 @@
                 scale = _reg_val(self, reg_list[2], scale)
             value = base + index * scale
 
-        value = segment + value + add
-        if 'esp' in self.regs:
-            # 32bit
-            return value % 0x100000000
-        else:
-            # 64bit
-            return value % 0x10000000000000000
+        return segment + value + add
 
     def report(self):
         understood = False
@@ -250,7 +243,7 @@
 
 def add_info(report):
     # Only interested in segmentation faults...
-    if report.get('Signal','0') != '11':
+    if report.get('Signal') != '11':
         return
 
     needed = ['Signal', 'Architecture', 'Disassembly', 'ProcMaps', 'Registers']
@@ -274,12 +267,9 @@
 
 
 if __name__ == '__main__':
-    if len(sys.argv)==2 and sys.argv[1] in ['-h','--help']:
-        print 'To run self-test, run without any arguments (or with -v)'
-        print 'To do stand-alone crash parsing:'
-        print '  Usage: %s Registers.txt Disassembly.txt ProcMaps.txt' % (sys.argv[0])
-        sys.exit(0)
-    elif len(sys.argv)==4:
+    if len(sys.argv)==4:
+        # 'Usage: %s Registers.txt Disassembly.txt Maps.txt' % (sys.argv[0])
+
         segv = ParseSegv(file(sys.argv[1]).read(), \
                          file(sys.argv[2]).read(), \
                          file(sys.argv[3]).read())
@@ -296,7 +286,7 @@
         import unittest, tempfile, sys
 
         # Default global registers, maps, and disassembly for testing
-        regs = '''eax            0xffffffff -1
+        regs = '''eax            0xbfc6afc4 -1077497916
 ecx            0xbfc6af40   -1077498048
 edx            0x1  1
 ebx            0x26eff4 2551796
@@ -313,40 +303,6 @@
 fs             0x4  4
 gs             0x33 51
 '''
-        regs64 = '''rax            0xffffffffffffffff   -1
-rbx            0x26eff4 2551796
-rcx            0xffffffffffffffff   -1
-rdx            0xffffffffff600180   -10485376
-rsi            0x0  0
-rdi            0x7fffffffe3b0   140737488348080
-rbp            0x0  0x0
-rsp            0x7fffffffe388   0x7fffffffe388
-r8             0x0  0
-r9             0x0  0
-r10            0x7fffffffe140   140737488347456
-r11            0x246    582
-r12            0x7fffffffe400   140737488348160
-r13            0x7fffffffe468   140737488348264
-r14            0x1  1
-r15            0x7fffffffe460   140737488348256
-rip            0x7ffff790be10   0x7ffff790be10 <nanosleep+16>
-eflags         0x246    [ PF ZF IF ]
-cs             0x33 51
-ss             0x2b 43
-ds             0x0  0
-es             0x0  0
-fs             0x0  0
-gs             0x0  0
-fctrl          0x37f    895
-fstat          0x0  0
-ftag           0xffff   65535
-fiseg          0x0  0
-fioff          0x40303a 4206650
-foseg          0x0  0
-fooff          0x0  0
-fop            0x5d8    1496
-mxcsr          0x1f80   [ IM DM ZM OM UM PM ]
-'''
         maps = '''00110000-0026c000 r-xp 00000000 08:06 375131     /lib/tls/i686/cmov/libc-2.9.so
 0026c000-0026d000 ---p 0015c000 08:06 375131     /lib/tls/i686/cmov/libc-2.9.so
 0026d000-0026f000 r--p 0015c000 08:06 375131     /lib/tls/i686/cmov/libc-2.9.so
@@ -593,15 +549,6 @@
                 self.assertEqual(segv.calculate_arg('0x3404403'), 0x3404403, '0x3404403')
                 self.assertEqual(segv.calculate_arg('*0x40(%edi)'), 0x80834c0, segv.regs['edi'])
                 self.assertEqual(segv.calculate_arg('(%edx,%ebx,1)'), 0x26eff5, segv.regs['ebx'])
-                self.assertEqual(segv.calculate_arg('(%eax,%ebx,1)'), 0x26eff3, segv.regs['ebx'])
-
-                # Again, but 64bit
-                disasm = '''0x08083540 <main+0>:    mov    $1,%rcx'''
-                segv = ParseSegv(regs64, disasm, maps)
-                understood, reason, details = segv.report()
-                self.assertFalse(understood, details)
-
-                self.assertEqual(segv.calculate_arg('(%rax,%rbx,1)'), 0x26eff3, segv.regs['rbx'])
 
             def test_segv_pc_missing(self):
                 '''Handles PC in missing VMA'''