summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-12-05 15:58:34 +0000
committerOlivier Blin <oblin@mandriva.org>2005-12-05 15:58:34 +0000
commit35b39f4f82e709e1a31c41991515dba47f8636d9 (patch)
treec5ca07845ad13c5f7d42c86eb7b293105a0b7045
parent4883a911251102f24028a9df1c5ceb9781a7c8d5 (diff)
downloaddrakx-backup-do-not-use-35b39f4f82e709e1a31c41991515dba47f8636d9.tar
drakx-backup-do-not-use-35b39f4f82e709e1a31c41991515dba47f8636d9.tar.gz
drakx-backup-do-not-use-35b39f4f82e709e1a31c41991515dba47f8636d9.tar.bz2
drakx-backup-do-not-use-35b39f4f82e709e1a31c41991515dba47f8636d9.tar.xz
drakx-backup-do-not-use-35b39f4f82e709e1a31c41991515dba47f8636d9.zip
make unicorn and madwifi tools package optionnal
-rw-r--r--perl-install/network/thirdparty.pm5
1 files changed, 4 insertions, 1 deletions
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;
}