From 33dfcba919dc587ea3724f194b6639b90514efc1 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Fri, 14 Mar 2008 13:50:27 +0000
Subject: split component_get_option function

---
 lib/network/thirdparty.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'lib/network/thirdparty.pm')

diff --git a/lib/network/thirdparty.pm b/lib/network/thirdparty.pm
index be1fe88..ef510ff 100644
--- a/lib/network/thirdparty.pm
+++ b/lib/network/thirdparty.pm
@@ -88,6 +88,11 @@ sub device_get_option {
     $value == 1 ? $o_default || $settings->{name} : $value;
 }
 
+sub component_get_option {
+    my ($settings, $component, $option) = @_;
+    ref $settings->{$component} eq 'HASH' && $settings->{$component}{$option} || $settings->{$option};
+}
+
 sub find_settings {
     my ($settings_list, $driver) = @_;
     find {
@@ -129,7 +134,7 @@ sub get_checked_element {
 sub warn_not_found {
     my ($in, $settings, $driver, $option, @packages) = @_;
     my %opt;
-    $opt{$_} = ref $settings->{$option} eq 'HASH' && $settings->{$option}{$_} || $settings->{$_} foreach qw(url explanations no_club no_package);
+    $opt{$_} = component_get_option($settings, $option, $_) foreach qw(url explanations no_club no_package);
     my $checked = get_checked_element($settings, $driver, $option);
     my $component_name = ref $settings->{$option} eq 'HASH' && translate($settings->{$option}{component_name}) || $option;
     $in->ask_warn(N("Error"),
-- 
cgit v1.2.1