← Back to branch summary

~mterry/ubiquity/oem-config-merge

« back to all changes in this revision

Viewing changes to ubiquity/components/usersetup.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.py
64
64
                     '^passwd/user-password$', '^passwd/user-password-again$',
65
65
                     '^user-setup/password-weak$',
66
66
                     'ERROR']
67
 
        environ = {'OVERRIDE_SYSTEM_USER': '1'}
68
67
        if self.frontend.oem_user_config:
 
68
            environ = {'OVERRIDE_SYSTEM_USER': '1'}
69
69
            return (['/usr/lib/ubiquity/user-setup/user-setup-ask'],
70
70
                    questions, environ)
71
71
        else:
72
72
            return (['/usr/lib/ubiquity/user-setup/user-setup-ask', '/target'],
73
 
                    questions, environ)
 
73
                    questions)
74
74
 
75
75
    def set(self, question, value):
76
76
        if question == 'passwd/username':