← Back to branch summary

~mterry/ubiquity/oem-config-merge

« back to all changes in this revision

Viewing changes to ubiquity/components/usersetup_apply.py

  • Committer: Michael Terry
  • Date: 2009-07-08 19:02:04 UTC
  • Revision ID: michael.terry@canonical.com-20090708190204-enzyfh27wxjpatrh
misc fixes; move netcfg and tasksel components to main package; don't allow unknown steps

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubiquity/components/usersetup_apply.py
22
22
 
23
23
class UserSetupApply(FilteredCommand):
24
24
    def prepare(self, unfiltered=False):
25
 
        environ = {'OVERRIDE_SYSTEM_USER': '1'}
26
25
        if 'UBIQUITY_OEM_USER_CONFIG' in os.environ:
 
26
            environ = {'OVERRIDE_SYSTEM_USER': '1'}
27
27
            return (['/usr/lib/ubiquity/user-setup/user-setup-apply'], [], environ)
28
28
        else:
29
29
            return (['/usr/lib/ubiquity/user-setup/user-setup-apply', '/target'],
30
 
                    [], environ)
 
30
                    [])
31
31
 
32
32
    def error(self, priority, question):
33
33
        self.frontend.error_dialog(self.description(question),