summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-03-18 15:27:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-03-18 15:27:47 +0000
commit23cfc13aa5c4dfb863ec9f06647eb49f7a7a054f (patch)
treea9df4d45605712250c508833b13e508b71521c7b
parent7cd16e1b1c1ddd916e09ff19c742dec1aa754389 (diff)
downloaddrakx-backup-do-not-use-23cfc13aa5c4dfb863ec9f06647eb49f7a7a054f.tar
drakx-backup-do-not-use-23cfc13aa5c4dfb863ec9f06647eb49f7a7a054f.tar.gz
drakx-backup-do-not-use-23cfc13aa5c4dfb863ec9f06647eb49f7a7a054f.tar.bz2
drakx-backup-do-not-use-23cfc13aa5c4dfb863ec9f06647eb49f7a7a054f.tar.xz
drakx-backup-do-not-use-23cfc13aa5c4dfb863ec9f06647eb49f7a7a054f.zip
always warn the user to logout, even if we can't help (bugzilla #14403)
-rw-r--r--perl-install/standalone/localedrake12
1 files changed, 7 insertions, 5 deletions
diff --git a/perl-install/standalone/localedrake b/perl-install/standalone/localedrake
index a329cc05b..5517ad5d1 100644
--- a/perl-install/standalone/localedrake
+++ b/perl-install/standalone/localedrake
@@ -63,9 +63,11 @@ if ($@) {
}
lang::write($locale, $>);
-if ($>) {
- if (my $wm = any::running_window_manager()) {
- $in->ask_yesorno('', N("The change is done, but to be effective you must logout"), 1)
- and any::ask_window_manager_to_logout($wm);
- }
+
+my $msg = N("The change is done, but to be effective you must logout");
+if (my $wm = $> && any::running_window_manager()) {
+ $in->ask_yesorno('', $msg, 1)
+ and any::ask_window_manager_to_logout($wm);
+} else {
+ $in->ask_warn('', $msg);
}