From 2cad2621c96beeae2b4eb9cab177f5666b0ce3c1 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Wed, 10 Sep 2008 16:13:41 +0000
Subject: guess country from timezone without asking if COUNTRY is set to
 "simplified" in the configuration file (#23303)

---
 perl-install/NEWS                      | 2 ++
 perl-install/standalone/finish-install | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 171f4fa35..05545027e 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -8,6 +8,8 @@
   o extract a "country" step out of the "language" one
   o guess country from timezone when possible (#23303)
   o call "country" and "keyboard" steps after "timezone" (#23303)
+  o guess country from timezone without asking if COUNTRY is set to
+    "simplified" in the configuration file (#23303)
   o behave nicely when a window manager is running (for debugging)
 
 Version 11.38 - 8 September 2008
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index b05ac19b0..c3d592faa 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -75,6 +75,7 @@ sub ask_timezone() {
     timezone::reload_sys_clock($timezone);
 }
 
+#- COUNTRY=simplified: guess the country from timezone, do not ask
 sub ask_country() {
     require lang;
     $locale ||= lang::read();
@@ -88,7 +89,7 @@ sub ask_country() {
             }
         }
     }
-    any::selectCountry($in, $locale);
+    any::selectCountry($in, $locale) if lc(get_conf('COUNTRY')) ne 'simplified';
     lang::write_and_install($locale, $in->do_pkgs);
 }
 
-- 
cgit v1.2.1