QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firstboot: fix error reporting on "Service VMs" page

Browse Source 
Also check for user existence in all required cases, not only when
"default VMs" was selected.
This commit is contained in:
Marek Marczykowski-Górecki 2014-04-08 05:27:18 +02:00
parent 9d8a1f945b
commit d2cc07b04f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firstboot/modules/qubes_setup.py
View File

@ -44,12 +44,21 @@ class moduleClass(Module):
self.icon = "qubes.png" self.icon = "qubes.png"
self.admin = libuser.admin() self.admin = libuser.admin()
def _showErrorMessage(self, text):
dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_ERROR, gtk.BUTTONS_OK, text)
dlg.set_position(gtk.WIN_POS_CENTER)
dlg.set_modal(True)
rc = dlg.run()
dlg.destroy()
return None
def apply(self, interface, testing=False): def apply(self, interface, testing=False):
try: try:
qubes_users = self.admin.enumerateUsersByGroup('qubes') qubes_users = self.admin.enumerateUsersByGroup('qubes')
if self.radio_servicevms_and_appvms.get_active() and len(qubes_users) < 1: if not self.radio_dontdoanything.get_active():
self._showErrorMessage(_("You must create a user account to create default AppVMs.")) if len(qubes_users) < 1:
self._showErrorMessage(_("You must create a user account to create default VMs."))
return RESULT_FAILURE return RESULT_FAILURE
else: else:
self.qubes_user = qubes_users[0] self.qubes_user = qubes_users[0]