summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-01-07 21:21:17 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-05-28 11:54:04 +0100
commit4a67c3c0b6ba4ee1a8ae782db10396756e3ae426 (patch)
tree5c4229e4ac84f820133ae312d94b4363214453bc
parent767dffd176a6c96733adbb557f74e9779ea3b927 (diff)
downloaddrakx-4a67c3c0b6ba4ee1a8ae782db10396756e3ae426.tar
drakx-4a67c3c0b6ba4ee1a8ae782db10396756e3ae426.tar.gz
drakx-4a67c3c0b6ba4ee1a8ae782db10396756e3ae426.tar.bz2
drakx-4a67c3c0b6ba4ee1a8ae782db10396756e3ae426.tar.xz
drakx-4a67c3c0b6ba4ee1a8ae782db10396756e3ae426.zip
installer: fix errors when installing network driver packages.
Don't call network::thirdparty::get_available_packages() if there are no packages to install - it generates lots of spurious error messages. (cherry picked from commit 125a6d66148781800c4b5c5f0d08ecd17d0dc74f)
-rw-r--r--perl-install/pkgs.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 265ef0d12..9a63037ec 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -209,7 +209,7 @@ sub detect_network_drivers {
foreach my $settings (@network_settings) {
foreach (@network::thirdparty::thirdparty_types) {
my @packages = network::thirdparty::get_required_packages($_, $settings);
- push @l, network::thirdparty::get_available_packages($_, $do_pkgs, @packages);
+ push @l, network::thirdparty::get_available_packages($_, $do_pkgs, @packages) if @packages;
}
}
}