Merge lp:~sil/ubuntu/lucid/rhythmbox/add-music-store-apport-hook into lp:ubuntu/lucid/rhythmbox

[Stuart Langridge]

Add to the Rhythmbox apport hook so that:
1. look for webkit or ubuntuone in the stacktrace and if found, assume that this is a music store bug and reassign to rhythmbox-ubuntuone-music-store
2. when asking the user what the problem was, add an option for the problem being with the Music Store and reassign to rhythmbox-ubuntuone-music-store if that was picked.

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-24 23:38:19 +0000
+++ debian/changelog	2010-03-25 11:50:37 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 rhythmbox (0.12.7-0ubuntu9) lucid; urgency=low
 
   * debian/patches/21_git_ignore_mounts_without_device.patch:
@@ -196,6 +197,17 @@
 
  -- Martin Pitt <[e-mail]>  Thu, 25 Feb 2010 19:14:46 +0100
 
+=======
+rhythmbox (0.12.6git20100223-0ubuntu2) lucid; urgency=low
+
+  * debian/source_rhythmbox.py:
+    - apport hook for rhythmbox (lp: #525888)
+  * debian/rhythmbox.install:
+    - update to install apport hook
+
+ -- Nigel Babu <[e-mail]>  Thu, 25 Feb 2010 09:49:44 +0530
+
+>>>>>>> MERGE-SOURCE
 rhythmbox (0.12.6git20100223-0ubuntu1) lucid; urgency=low
 
   * New git snapshot:

=== added file 'debian/source_rhythmbox.py'
--- debian/source_rhythmbox.py	1970-01-01 00:00:00 +0000
+++ debian/source_rhythmbox.py	2010-03-25 11:50:37 +0000
@@ -0,0 +1,50 @@
+import os
+import re
+
+import apport.packaging
+import apport.hookutils
+
+def mask_string (str):
+    MASK = '##MASKED##'
+    return str.group(1) + MASK
+
+def mask_values(gconfinfo):
+    """ strip personal/private information from the GConf entries """
+    pattrn = re.compile ('((add_dir|library_locations|download_prefix|share_password|share_name|username|password)=)(.*)$',
+    re.IGNORECASE)
+    newReport = ""
+    for line in gconfinfo.splitlines():
+        line = pattrn.sub (mask_string, line)
+        newReport += line + '\n'
+    return newReport
+
+def add_info(report, ui):
+
+    # Check to see if the stacktrace is a webkit or libubuntuone issue
+    # if it is, then reassign to the Ubuntu One Music Store
+    stacktrace = report.get("Stacktrace", None)
+    if stacktrace:
+        if "ubuntuone" in stacktrace or "webkit" in stacktrace:
+            report.add_package_info("rhythmbox-ubuntuone-music-store")
+            return
+    
+
+    response = ui.choice("How would you describe the issue?", ["The rhythmbox interface is not working correctly", "No sound is being played", "Some audio files are not being played correctly", "The Ubuntu One Music Store is not working correctly"], False)
+
+    if response == None: # user cancelled
+        raise StopIteration
+    if response[0] == 0: # an issue about rhythmbox interface
+        apport.hookutils.attach_gconf(report, 'rhythmbox')
+        report['GConfNonDefault'] = mask_values(report['GConfNonDefault'])
+    if response[0] == 1: # the issue is a sound one
+        os.execlp('apport-bug', 'apport-bug', 'audio')
+    if response[0] == 2: # the issue is a codec one
+        report.add_package_info("libgstreamer0.10-0")
+        return
+    if response[0] == 3: # problem with the music store
+        report.add_package_info("rhythmbox-ubuntuone-music-store")
+        return
+
+    report["LogAlsaMixer"] = apport.hookutils.command_output(["/usr/bin/amixer"])
+    report["GstreamerVersions"] = apport.hookutils.package_versions("gstreamer*")
+    report["XorgLog"] = apport.hookutils.read_file("/var/log/Xorg.0.log")

=== renamed file 'debian/source_rhythmbox.py' => 'debian/source_rhythmbox.py.moved'