~ubuntu-branches/ubuntu/saucy/jockey/saucy

« back to all changes in this revision

Viewing changes to jockey/ui.py

  • Committer: Package Import Robot
  • Author(s): Martin Pitt
  • Date: 2011-09-29 17:22:09 UTC
  • Revision ID: package-import@ubuntu.com-20110929172209-hkbni25r2wospuhb
Tags: 0.9.4-0ubuntu9
Only ask for confirmation in check_composite if --confirm has been set.
Thanks to Evan Dandrea! Patch cherrypicked from trunk r740.
(LP: #855042)

Show diffs side-by-side

added added

removed removed

Lines of Context:
568
568
        h_id = self.backend().check_composite()
569
569
 
570
570
        if h_id:
571
 
            self.set_handler_enable(h_id, 'enable', True)
 
571
            self.set_handler_enable(h_id, 'enable', self.argv_options.confirm)
572
572
            return bool(self.backend().handler_info(h_id)['enabled'])
573
573
 
574
574
        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.'))