always warn the user to logout, even if we can't help (bugzilla #14403)

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);
 }