← Back to branch summary

~xubuntu-dev/ubiquity/lp1437180_feh

« back to all changes in this revision

Viewing changes to bin/ubiquity-dm

  • Committer: Colin Watson
  • Date: 2010-03-18 21:19:59 UTC
  • Revision ID: cjwatson@canonical.com-20100318211959-tk7we4tgqr72cg00
https://launchpad.net/bugs/540938
Don't fall through to the failsafe X server if the main X server
succeeds (LP: #540938).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubiquity-dm
219
219
                if attempt == 'failsafe':
220
220
                    raise
221
221
 
 
222
            if self.server_started:
 
223
                break
 
224
 
222
225
        os.environ['DISPLAY'] = self.display
223
226
        os.environ['HOME'] = self.homedir
224
227
        # Give ubiquity a UID and GID that it can drop privileges to.