StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final (?) version

This commit is contained in:
Michael Hudson-Doyle 2016-07-28 14:34:48 +12:00
parent e4d5c7fa85
commit 6112c441b0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console_conf/controllers/identity.py
View File

@ -28,7 +28,7 @@ class IdentityController(BaseIdentityController):
footer = "" footer = ""
self.ui.set_header(title, excerpt) self.ui.set_header(title, excerpt)
self.ui.set_footer(footer, 40) self.ui.set_footer(footer, 40)
self.ui.set_body(self.identity_view(self.model, self.signal, self.opts)) self.ui.set_body(self.identity_view(self.model, self.signal, self.opts, self.loop))
def login(self): def login(self):
title = "Configuration Complete" title = "Configuration Complete"

15
console_conf/ui/views/identity.py
View File

@ -15,7 +15,6 @@
import logging import logging
import pwd import pwd
import re
from urwid import (Pile, Columns, Text, ListBox) from urwid import (Pile, Columns, Text, ListBox)
from subiquitycore.ui.buttons import done_btn, cancel_btn from subiquitycore.ui.buttons import done_btn, cancel_btn
@ -49,18 +48,21 @@ log = logging.getLogger("console_conf.views.identity")
class IdentityView(BaseView): class IdentityView(BaseView):
def __init__(self, model, signal, opts): def __init__(self, model, signal, opts, loop):
self.model = model self.model = model
self.signal = signal self.signal = signal
self.opts = opts self.opts = opts
self.loop = loop
self.items = [] self.items = []
self.email = EmailEditor(caption="") self.email = EmailEditor(caption="")
self.error = Text("", align="center") self.error = Text("", align="center")
self.progress = Text("", align="center")
body = [ body = [
Padding.center_90(self._build_model_inputs()), Padding.center_90(self._build_model_inputs()),
Padding.line_break(""), Padding.line_break(""),
Padding.center_90(Color.info_error(self.error)), Padding.center_90(Color.info_error(self.error)),
Padding.center_90(self.progress),
Padding.line_break(""), Padding.line_break(""),
Padding.fixed_10(self._build_buttons()), Padding.fixed_10(self._build_buttons()),
] ]
@ -98,8 +100,11 @@ class IdentityView(BaseView):
self.error.set_text("Please enter an email address.") self.error.set_text("Please enter an email address.")
return return
if not self.opts.dry_run: if not self.opts.dry_run:
self.progress.set_text("Contacting store...")
self.loop.draw_screen()
users_before = users() users_before = users()
result = run_command(["snap", "create-user", self.email.value]) result = run_command(["snap", "create-user", self.email.value])
self.progress.set_text("")
if result['status'] != 0: if result['status'] != 0:
self.error.set_text("Creating user failed:\n" + result['err']) self.error.set_text("Creating user failed:\n" + result['err'])
return return
@ -110,12 +115,16 @@ class IdentityView(BaseView):
self.error.set_text("uhh") self.error.set_text("uhh")
return return
new_user = pwd.getpwnam(new_users.pop()) new_user = pwd.getpwnam(new_users.pop())
# Use email for realname until
# https://bugs.launchpad.net/snappy/+bug/1607121 is resolved.
result = { result = {
'realname': new_user.pw_gecos.split(",")[0], 'realname': self.email.value, #new_user.pw_gecos.split(",")[0]
'username': new_user.pw_name, 'username': new_user.pw_name,
'passwod': '', 'passwod': '',
'confirm_password': '' 'confirm_password': ''
} }
# Work around https://bugs.launchpad.net/snappy/+bug/1606815
run_command(["chown", "{}:{}".format(new_user.pw_uid, new_user.pw_gid), "-R", new_user.pw_dir])
self.model.add_user(result) self.model.add_user(result)
else: else:
result = { result = {