summaryrefslogtreecommitdiffstats
path: root/perl-install/any.pm
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2009-09-23 16:36:02 +0000
committerOlivier Blin <oblin@mandriva.com>2009-09-23 16:36:02 +0000
commitc7a6fd639fff984e6a0fd98cd8e357056027327b (patch)
treef8fa77115420cf83022b491a3d3af7acb7dc182f /perl-install/any.pm
parenta63798bd8a60df9a840d898144899dba37c37344 (diff)
downloaddrakx-c7a6fd639fff984e6a0fd98cd8e357056027327b.tar
drakx-c7a6fd639fff984e6a0fd98cd8e357056027327b.tar.gz
drakx-c7a6fd639fff984e6a0fd98cd8e357056027327b.tar.bz2
drakx-c7a6fd639fff984e6a0fd98cd8e357056027327b.tar.xz
drakx-c7a6fd639fff984e6a0fd98cd8e357056027327b.zip
simplify
Diffstat (limited to 'perl-install/any.pm')
-rw-r--r--perl-install/any.pm20
1 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index b9418dd21..fa3d9137d 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -653,16 +653,16 @@ sub get_autologin() {
$desktop_to_dm{$desktop} ||
chomp_(run_program::rooted_get_stdout("/etc/X11/lookupdm"));
$dm = $dm_canonical{$dm} if exists $dm_canonical{$dm};
- my $autologin = do {
- if ($dm eq "gdm") {
- my %conf = read_gnomekderc($gdm_file, 'daemon');
- text2bool($conf{AutomaticLoginEnable}) && $conf{AutomaticLogin};
- } else { # KDM / MdkKDM
- my %conf = read_gnomekderc($kdm_file, 'X-:0-Core');
- text2bool($conf{AutoLoginEnable}) && $conf{AutoLoginUser};
- }
- };
- { autologin => $autologin, desktop => $desktop };
+
+ my $autologin_user;
+ if ($dm eq "gdm") {
+ my %conf = read_gnomekderc($gdm_file, 'daemon');
+ $autologin_user = text2bool($conf{AutomaticLoginEnable}) && $conf{AutomaticLogin};
+ } else { # KDM / MdkKDM
+ my %conf = read_gnomekderc($kdm_file, 'X-:0-Core');
+ $autologin_user = text2bool($conf{AutoLoginEnable}) && $conf{AutoLoginUser};
+ }
+ { autologin => $autologin_user, desktop => $desktop };
}
sub set_autologin {