← 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: 2012-02-16 03:05:05 UTC
  • Revision ID: cjwatson@canonical.com-20120216030505-a9e9b4vw05ar09o9
https://launchpad.net/bugs/888107
ubiquity-dm: Try openbox after openbox-lubuntu (LP: #888107).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ubiquity-dm
349
349
                wm_cmd = ['matchbox-window-manager']
350
350
            elif osextras.find_on_path('openbox-lubuntu'):
351
351
                wm_cmd = ['openbox-lubuntu']
 
352
            elif osextras.find_on_path('openbox'):
 
353
                wm_cmd = ['openbox']
352
354
            else:
353
355
                raise MissingProgramError('No window manager found (tried '
354
356
                    'metacity, xfwm4, matchbox-window-manager, '
355
 
                    'openbox-lubuntu)')
 
357
                    'openbox-lubuntu, openbox)')
356
358
            wm = subprocess.Popen(wm_cmd,
357
359
                stdin=null, stdout=logfile, stderr=logfile,
358
360
                preexec_fn=self.drop_privileges)
382
384
                extras.append(proc)
383
385
 
384
386
            if os.path.exists('/usr/lib/ubiquity/panel') and "xfwm4" not in wm_cmd:
385
 
                if  "openbox-lubuntu" not in wm_cmd:
 
387
                if "openbox-lubuntu" not in wm_cmd and "openbox" not in wm_cmd:
386
388
                    extras.append(subprocess.Popen(
387
389
                        ['/usr/lib/ubiquity/panel'],
388
390
                        stdin=null, stdout=logfile, stderr=logfile,