diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-04-29 13:52:25 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-04-29 13:52:25 +0000 |
| commit | d50e5d9b902e94a2b0abf270a293d465b44eb183 (patch) | |
| tree | 538642faca5ee5df9588390296158d20c7fdbd22 /perl-install/standalone/drakedm | |
| parent | 087dee5d27190c78efd3baac6046587ea96ad9ad (diff) | |
| download | drakx-backup-do-not-use-d50e5d9b902e94a2b0abf270a293d465b44eb183.tar drakx-backup-do-not-use-d50e5d9b902e94a2b0abf270a293d465b44eb183.tar.gz drakx-backup-do-not-use-d50e5d9b902e94a2b0abf270a293d465b44eb183.tar.bz2 drakx-backup-do-not-use-d50e5d9b902e94a2b0abf270a293d465b44eb183.tar.xz drakx-backup-do-not-use-d50e5d9b902e94a2b0abf270a293d465b44eb183.zip | |
fix #3701: return back to the display managers menu if one cancel the
installation of the required packages
Diffstat (limited to 'perl-install/standalone/drakedm')
| -rw-r--r-- | perl-install/standalone/drakedm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index 81215d61f..76e4e53c0 100644 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -39,6 +39,7 @@ foreach (cat_($cfg_file)) { $dm = uc($1) if /^DISPLAYMANAGER=(.*)$/; } +start: if ($in->ask_from(N("Choosing a display manager"), formatAlaTeX(N("X11 Display Manager allows you to graphically log into your system with the X Window System running and supports running @@ -55,12 +56,12 @@ several different X sessions on your local machine at the same time.")), ) ) { log::explanations("modified file $cfg_file"); + ! -x $dm{$dm}[1] && do { $in->do_pkgs->ensure_is_installed($dm{$dm}[2], $dm{$dm}[1]) or goto start }; substInFile { s/^(DISPLAYMANAGER)=.*(\n|)//; s/^\n//g; $_ .= "\nDISPLAYMANAGER=$dm\n" if eof; } $cfg_file; - $in->do_pkgs->install($dm{$dm}[2]) unless -x $dm{$dm}[1]; } $in->exit(0); |