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/standalone/finish-install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'perl-install/standalone/finish-install')

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