From f1b09507c7303487896fe3e9b37d3942989c669b Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 9 Oct 2009 15:59:13 +0000
Subject: abort autologin configuration if dm install fails

---
 perl-install/any.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'perl-install/any.pm')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index 89ccdcd6b..98e3c0d56 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -678,9 +678,12 @@ sub set_autologin {
     my $do_autologin = bool2text($autologin->{user});
 
     $autologin->{dm} ||= 'xdm';
-    $do_pkgs->ensure_is_installed($autologin->{dm});
-    $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin')
-      if $autologin->{user} && $autologin->{dm} eq 'xdm';
+    $do_pkgs->ensure_is_installed($autologin->{dm})
+      or return;
+    if ($autologin->{user} && $autologin->{dm} eq 'xdm') {
+        $do_pkgs->ensure_is_installed('autologin', '/usr/bin/startx.autologin')
+          or return;
+    }
 
     #- Configure KDM / MDKKDM
     my $kdm_conffile = common::read_alternative('kdm4-config');
-- 
cgit v1.2.1