Jockey

Merge lp:~ev/jockey/855042 into lp:jockey

  1. 855042
  2. Merge into trunk
Proposed by Evan
Status: Merged
Merged at revision: 740
Proposed branch: lp:~ev/jockey/855042
Merge into: lp:jockey
Diff against target: 12 lines (+1/-1)
1 file modified
jockey/ui.py (+1/-1)
To merge this branch: bzr merge lp:~ev/jockey/855042
Reviewer Review Type Date Requested Status
Martin Pitt (community) Approve
Review via email: mp+77497@code.launchpad.net

Description of the change

Colin correctly points out in bug 855042 that jockey always asks for confirmation when using the composite driver installation option, regardless of whether --confirm has been set. This patch fixes that.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Nice catch, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jockey/ui.py'
2--- jockey/ui.py 2011-08-22 09:03:12 +0000
3+++ jockey/ui.py 2011-09-29 10:35:41 +0000
4@@ -568,7 +568,7 @@
5 h_id = self.backend().check_composite()
6
7 if h_id:
8- self.set_handler_enable(h_id, 'enable', True)
9+ self.set_handler_enable(h_id, 'enable', self.argv_options.confirm)
10 return bool(self.backend().handler_info(h_id)['enabled'])
11
12 self.error_msg(self._('There is no available graphics driver for your system which supports the composite extension, or the current one already supports it.'))

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: