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

[fdsoqweo4]

[Michael Casadevall (mcasadevall)]

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

[Martin Pitt (pitti)]

Thank you! Merged and uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-10 14:18:41 +0000
+++ debian/changelog	2010-11-23 02:44:14 +0000
@@ -1,3 +1,9 @@
+apport-symptoms (0.10) natty; urgency=low
+
+  * audio.py: Resolves syntax confusion in audio test (LP: #678371)
+
+ -- Weston Miller <[e-mail]>  Mon, 22 Nov 2010 20:27:25 -0600
+
 apport-symptoms (0.9) lucid; urgency=low
 
   * storage.py: Move from devicekit-disks to udisks.
 
=== modified file 'symptoms/audio.py'
--- symptoms/audio.py	2010-02-14 01:20:37 +0000
+++ symptoms/audio.py	2010-11-23 02:44:14 +0000
@@ -278,7 +278,8 @@
 
     ui.information('Next, a speaker test will be performed. For your safety,\n'
      'if you have headphones on, take them off to avoid damaging your ears.\n'
-     'Press OK to hear the test tone. It should alternate between %d channels.'
+     'Close this window to hear the test tones.\n'
+     'It should alternate between %d channels.'
      % channelcount)
     run_subprocess(report, 'SpeakerTestAlsa', ['pasuspender', '--', 
         'speaker-test', '-l', '3', '-c', str(channelcount), '-b', '100000', 
@@ -286,7 +287,8 @@
     if not ui.yesno('Were the test tones played back correctly?'):
         return set_title(report, 'alsa-base', 'ALSA test tone not correctly played back', card)
 
-    ui.information('Press OK to hear the second test tone. It should alternate between channels.')
+    ui.information('Close this window to hear the second test tone.\n'
+     'It should alternate between channels.')
     run_subprocess(report, 'SpeakerTestPulse', ['speaker-test', '-l', '3', 
      '-c', str(channelcount), '-b', '100000', '-D', 'pulse', '-t', 'sine'])
     if not ui.yesno('Were the test tones played back correctly?'):