From 2872af8f69baee0d7af5a52483e225951230b84b Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Mon, 23 May 2011 16:20:03 +0400 Subject: [PATCH] Add migrated users information. --- i18n/cl_install_ru.mo | Bin 24426 -> 24481 bytes pym/cl_install.py | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/i18n/cl_install_ru.mo b/i18n/cl_install_ru.mo index 9c998dd1c6660d3e7126acb7e764fb3e80a89873..99dea5ad6411ddc9e6f99338afd168fa8afb4b88 100644 GIT binary patch delta 5091 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 diff --git a/pym/cl_install.py b/pym/cl_install.py index 2f72aa7..36125b7 100644 --- a/pym/cl_install.py +++ b/pym/cl_install.py @@ -862,11 +862,17 @@ class cl_install(color_print, SignalInterrupt): flash = clGet('os_install_root_type')=="flash" usbhdd = clGet('os_install_root_type')=="usb-hdd" hdd = clGet('os_install_root_type')=="hdd" + if not flash: + musers = ", ".join(set(clGet('cl_migrate_user'))-set(['root'])) \ + or _("none") + else: + musers = _("none") printData = [ [(_("System information"),True), (_("Computer name"),clGet('os_install_net_hostname'),not flash), (_("Domain name"),clGet('os_install_net_domain'),not flash), + (_("Users"), musers,not flash), (_("Network devices"),clGet('os_net_interfaces_info'),hdd), (_("Installed system"),installedSystem,True) ],