diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-02-12 22:15:02 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-02-12 17:48:42 (GMT) |
| commit | 2150b3aaa0c80d58989c4e9859b1d2bc3af47053 (patch) | |
| tree | 66e13e921000c36acd7633f4ea4649e5806159ee | |
| parent | 5169e7f74a65df3e0c622a620f13088453405423 (diff) | |
Intro: Fall back to user name if GECOS real name field is empty
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: Aleksey Lim <alsroot@activitycentral.org>
| -rw-r--r-- | src/jarabe/intro/window.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py index a18a0d2..e64d46b 100644 --- a/src/jarabe/intro/window.py +++ b/src/jarabe/intro/window.py @@ -172,13 +172,9 @@ class _IntroBox(hippo.CanvasBox): self._page = self.PAGE_COLOR if default_nick == 'system': pwd_entry = pwd.getpwuid(os.getuid()) - if pwd_entry.pw_gecos: - nick = pwd_entry.pw_gecos.split(',')[0] - self._name_page.set_name(nick) - else: - self._name_page.set_name(pwd_entry.pw_name) - else: - self._name_page.set_name(default_nick) + default_nick = (pwd_entry.pw_gecos.split(',')[0] or + pwd_entry.pw_name) + self._name_page.set_name(default_nick) self._setup_page() |