From 3bad113b4c0ce6ac8d5982815ec65c821b7bd913 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 20 Mar 2012 19:52:37 +0000
Subject: (detect_crda_domain) fix CRDA never set to 'US' when country not in
 CRDA domains

we would set CRDA to 'US' only if country was undefined instead of not in CRDA domains.
might help quite a log bug reports...
(bug introduced by eugeni in commit r256513 on Apr 15 2009)

caught while performing perl_checker cleanup & fixes, the most beautiful being in
detect_crda_domain():

-        if (grep($country, @crda_domains)) {
+        if (member($country, @crda_domains)) {

exercise left to the reader...
---
 NEWS                   | 3 +++
 lib/network/network.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 5188d88..3df437c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- fix CRDA never set to 'US' when country not in CRDA domains
+  (might help #1015 & the like)
+
 1.4:
 - adapt to drakxtools-13.92+ API change
   (reduces net_applet resident memory)
diff --git a/lib/network/network.pm b/lib/network/network.pm
index 62824d8..b2efee5 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -723,7 +723,7 @@ sub detect_crda_domain() {
     if (!$crda) {
         my $locale = lang::read($>);
         my $country = $locale->{country};
-        if (grep($country, @crda_domains)) {
+        if (member($country, @crda_domains)) {
             $crda = $country;
         } else {
             $crda = "US";
-- 
cgit v1.2.1