Ubuntu
rhythmbox package

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

  1. Lucid (10.04)
  2. add-music-store-apport-hook
  3. Merge into lucid
Proposed by Stuart Langridge
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~sil/ubuntu/lucid/rhythmbox/add-music-store-apport-hook
Merge into: lp:ubuntu/lucid/rhythmbox
Diff against target: 83 lines (+62/-0) (has conflicts)
2 files modified
debian/changelog (+12/-0)
debian/source_rhythmbox.py (+50/-0)
Text conflict in debian/changelog
Conflict adding file debian/source_rhythmbox.py.  Moved existing file to debian/source_rhythmbox.py.moved.
To merge this branch: bzr merge lp:~sil/ubuntu/lucid/rhythmbox/add-music-store-apport-hook
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+22117@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1<<<<<<< TREE
1rhythmbox (0.12.7-0ubuntu9) lucid; urgency=low2rhythmbox (0.12.7-0ubuntu9) lucid; urgency=low
23
3 * debian/patches/21_git_ignore_mounts_without_device.patch:4 * debian/patches/21_git_ignore_mounts_without_device.patch:
@@ -196,6 +197,17 @@
196197
197 -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 25 Feb 2010 19:14:46 +0100198 -- Martin Pitt <martin.pitt@ubuntu.com> Thu, 25 Feb 2010 19:14:46 +0100
198199
200=======
201rhythmbox (0.12.6git20100223-0ubuntu2) lucid; urgency=low
202
203 * debian/source_rhythmbox.py:
204 - apport hook for rhythmbox (lp: #525888)
205 * debian/rhythmbox.install:
206 - update to install apport hook
207
208 -- Nigel Babu <nigelbabu@gmail.com> Thu, 25 Feb 2010 09:49:44 +0530
209
210>>>>>>> MERGE-SOURCE
199rhythmbox (0.12.6git20100223-0ubuntu1) lucid; urgency=low211rhythmbox (0.12.6git20100223-0ubuntu1) lucid; urgency=low
200212
201 * New git snapshot:213 * New git snapshot:
202214
=== 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 @@
1import os
2import re
3
4import apport.packaging
5import apport.hookutils
6
7def mask_string (str):
8 MASK = '##MASKED##'
9 return str.group(1) + MASK
10
11def mask_values(gconfinfo):
12 """ strip personal/private information from the GConf entries """
13 pattrn = re.compile ('((add_dir|library_locations|download_prefix|share_password|share_name|username|password)=)(.*)$',
14 re.IGNORECASE)
15 newReport = ""
16 for line in gconfinfo.splitlines():
17 line = pattrn.sub (mask_string, line)
18 newReport += line + '\n'
19 return newReport
20
21def add_info(report, ui):
22
23 # Check to see if the stacktrace is a webkit or libubuntuone issue
24 # if it is, then reassign to the Ubuntu One Music Store
25 stacktrace = report.get("Stacktrace", None)
26 if stacktrace:
27 if "ubuntuone" in stacktrace or "webkit" in stacktrace:
28 report.add_package_info("rhythmbox-ubuntuone-music-store")
29 return
30
31
32 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)
33
34 if response == None: # user cancelled
35 raise StopIteration
36 if response[0] == 0: # an issue about rhythmbox interface
37 apport.hookutils.attach_gconf(report, 'rhythmbox')
38 report['GConfNonDefault'] = mask_values(report['GConfNonDefault'])
39 if response[0] == 1: # the issue is a sound one
40 os.execlp('apport-bug', 'apport-bug', 'audio')
41 if response[0] == 2: # the issue is a codec one
42 report.add_package_info("libgstreamer0.10-0")
43 return
44 if response[0] == 3: # problem with the music store
45 report.add_package_info("rhythmbox-ubuntuone-music-store")
46 return
47
48 report["LogAlsaMixer"] = apport.hookutils.command_output(["/usr/bin/amixer"])
49 report["GstreamerVersions"] = apport.hookutils.package_versions("gstreamer*")
50 report["XorgLog"] = apport.hookutils.read_file("/var/log/Xorg.0.log")
051
=== renamed file 'debian/source_rhythmbox.py' => 'debian/source_rhythmbox.py.moved'

Subscribers

People subscribed via source and target branches

to all changes: