← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ubiquity/lucid-updates

« back to all changes in this revision

Viewing changes to bin/ubiquity-dm

  • Committer: Bazaar Package Importer
  • Author(s): Evan Dandrea
  • Date: 2010-04-26 17:00:55 UTC
  • Revision ID: james.westby@ubuntu.com-20100426170055-bbnrr6n1o8l2bvm4
Tags: 2.2.23
https://launchpad.net/bugs/559647
https://launchpad.net/bugs/560114
* Correctly select the detected timezone (LP: #559647).
* Don't reboot on failure if we say we're not going to.
* Always run wrap_fix in its entirety, even if the width or height
  hasn't changed, as we may have switched text direction since the
  last run (LP: #560114).
* Properly align keyboard_test_label, which was getting cut off in RTL
  languages with the wrap_fix in place.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubiquity-dm
384
384
                    subprocess.call(['sh', '-c', error_cmd])
385
385
            except debconf.DebconfError:
386
386
                pass
 
387
            
 
388
            reboot = False
387
389
            try:
388
 
                reboot = db.get('ubiquity/reboot_on_failure') == 'true'
 
390
                if '--automatic' in program:
 
391
                    reboot = db.get('ubiquity/reboot_on_failure') == 'true'
389
392
            except debconf.DebconfError:
390
 
                reboot = False
 
393
                pass
391
394
            
392
 
            if '--automatic' in program and reboot:
 
395
            if reboot:
393
396
                question = 'ubiquity/install_failed_reboot'
394
397
            else:
395
398
                question = 'ubiquity/install_failed'