From 35b39f4f82e709e1a31c41991515dba47f8636d9 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Mon, 5 Dec 2005 15:58:34 +0000
Subject: make unicorn and madwifi tools package optionnal

---
 perl-install/network/thirdparty.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'perl-install/network/thirdparty.pm')

diff --git a/perl-install/network/thirdparty.pm b/perl-install/network/thirdparty.pm
index b08a28d04..b7b8c1e03 100644
--- a/perl-install/network/thirdparty.pm
+++ b/perl-install/network/thirdparty.pm
@@ -207,6 +207,7 @@ my %network_settings = (
     name => 'madwifi',
     kernel_module => 1,
     tools => {
+	optionnal => 1,
 	test_file => '/usr/bin/athstats',
     },
    },
@@ -266,6 +267,7 @@ You can find a driver on http://eciadsl.flashtux.org/"),
         test_file => 'unicorn_.*_atm',
     },
     tools => {
+	optionnal => 1,
 	test_file => '/usr/bin/bewan_adsl_status',
     },
    },
@@ -464,7 +466,8 @@ sub install_packages {
 	if (my @packages = $get_method->('get_packages')->($name)) {
 	    log::explanations("Installing thirdparty packages ($option) " . join(', ', @packages));
 	    if (!$in->do_pkgs->install(@packages)) {
-		warn_not_installed($in, @packages);
+		 next if ref $settings->{$option} eq 'HASH' && $settings->{$option}{optionnal};
+		 warn_not_installed($in, @packages);
 	    } elsif ($get_method->('check_installed')->()) {
 		next;
 	    }
-- 
cgit v1.2.1