Merge lp:~nfiewiqp4n321fdsaniro34214/apport/apport-symptoms into lp:~ubuntu-dev/apport/apport-symptoms

Proposed by fdsoqweo4
Status: Merged
Merged at revision: 42
Proposed branch: lp:~nfiewiqp4n321fdsaniro34214/apport/apport-symptoms
Merge into: lp:~ubuntu-dev/apport/apport-symptoms
Diff against target: 37 lines (+10/-2)
2 files modified
debian/changelog (+6/-0)
symptoms/audio.py (+4/-2)
To merge this branch: bzr merge lp:~nfiewiqp4n321fdsaniro34214/apport/apport-symptoms
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Michael Casadevall Approve
Review via email: mp+41544@code.launchpad.net

This proposal supersedes a proposal from 2010-11-23.

To post a comment you must log in.
Revision history for this message
Michael Casadevall (mcasadevall) wrote :

Code looks sane to me, and appears to correct the bug, but unsure if this is the correct approach to resolving this. pitti should look and do the actual merge however.

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

Thank you! Merged and uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-03-10 14:18:41 +0000
3+++ debian/changelog 2010-11-23 02:44:14 +0000
4@@ -1,3 +1,9 @@
5+apport-symptoms (0.10) natty; urgency=low
6+
7+ * audio.py: Resolves syntax confusion in audio test (LP: #678371)
8+
9+ -- Weston Miller <westonmiller@gmail.com> Mon, 22 Nov 2010 20:27:25 -0600
10+
11 apport-symptoms (0.9) lucid; urgency=low
12
13 * storage.py: Move from devicekit-disks to udisks.
14
15=== modified file 'symptoms/audio.py'
16--- symptoms/audio.py 2010-02-14 01:20:37 +0000
17+++ symptoms/audio.py 2010-11-23 02:44:14 +0000
18@@ -278,7 +278,8 @@
19
20 ui.information('Next, a speaker test will be performed. For your safety,\n'
21 'if you have headphones on, take them off to avoid damaging your ears.\n'
22- 'Press OK to hear the test tone. It should alternate between %d channels.'
23+ 'Close this window to hear the test tones.\n'
24+ 'It should alternate between %d channels.'
25 % channelcount)
26 run_subprocess(report, 'SpeakerTestAlsa', ['pasuspender', '--',
27 'speaker-test', '-l', '3', '-c', str(channelcount), '-b', '100000',
28@@ -286,7 +287,8 @@
29 if not ui.yesno('Were the test tones played back correctly?'):
30 return set_title(report, 'alsa-base', 'ALSA test tone not correctly played back', card)
31
32- ui.information('Press OK to hear the second test tone. It should alternate between channels.')
33+ ui.information('Close this window to hear the second test tone.\n'
34+ 'It should alternate between channels.')
35 run_subprocess(report, 'SpeakerTestPulse', ['speaker-test', '-l', '3',
36 '-c', str(channelcount), '-b', '100000', '-D', 'pulse', '-t', 'sine'])
37 if not ui.yesno('Were the test tones played back correctly?'):

Subscribers

People subscribed via source and target branches