xserver-xorg-video-intel: Changes to 'ubuntu'

[Bryce Harrington <bryce-guest@alioth.debian.org>]

 debian/apport-gpu-error-intel.py |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 553d4d76a1470b793a333a8b00e605af4f4bea90
Author: Bryce Harrington <bryce@canonical.com>
Date:   Fri Mar 18 13:44:58 2011 -0700

    Drop hashes in titles.
    
    The cases where error codes are *not* present are generally due to
    out-of-memory conditions, and so the bug reports are otherwise
    unactionable.  So it doesn't matter if they accidentally get duped.
    
    The case of a gpu lockup having a single error code is appearing to be
    rare enough in practice that we don't need to special case that.

diff --git a/debian/apport-gpu-error-intel.py b/debian/apport-gpu-error-intel.py
index 5743386..44500fb 100644
--- a/debian/apport-gpu-error-intel.py
+++ b/debian/apport-gpu-error-intel.py
@@ -4,7 +4,6 @@ import os
 import os.path
 import sys
 import re
-import hashlib
 
 from apport.hookutils import *
 
@@ -72,20 +71,16 @@ def get_pci_device(text):
 def get_dump_signature(text):
     if not text:
         return None
-    m = hashlib.md5()
-    m.update(text)
     codes = []
     for k in ["EIR", "ESR", "PGTBL_ER", "IPEHR"]:
         regex = re.compile(k+": 0x([0-9a-fA-F]+)")
         match = regex.search(text)
         if match and match.group(1) != "00000000":
             codes.append("%s: 0x%s" %(k, match.group(1)))
-    if len(codes) > 1:
+    if len(codes) > 0:
         return "(%s)" %( string.join(codes, " ") )
-    elif len(codes) == 1:
-        return "%s (%s)" %( m.hexdigest()[:8], string.join(codes, " ") )
     else:
-        return "%s" %( m.hexdigest()[:8] )
+        return ""
 
 def main(argv=None):
     if argv is None: