From d0a637b483e2790bd8abfddf615b47937c3d937b Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 18 Aug 2008 12:50:45 +0000 Subject: do not require interactive object in get_available_packages, just do_pkgs --- lib/network/thirdparty.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/network/thirdparty.pm') diff --git a/lib/network/thirdparty.pm b/lib/network/thirdparty.pm index 5398cd2..f5a32eb 100644 --- a/lib/network/thirdparty.pm +++ b/lib/network/thirdparty.pm @@ -273,11 +273,11 @@ sub check_installed { } sub get_available_packages { - my ($type, $in, @names) = @_; + my ($type, $do_pkgs, @names) = @_; if ($type eq 'kernel_module') { - return map { my $l = $in->do_pkgs->check_kernel_module_packages($_); $l ? @$l : () } @names; + return map { my $l = $do_pkgs->check_kernel_module_packages($_); $l ? @$l : () } @names; } else { - return $in->do_pkgs->is_available(@names); + return $do_pkgs->is_available(@names); } } @@ -312,7 +312,7 @@ sub install_packages { } my $optional = ref $settings->{$component} eq 'HASH' && $settings->{$component}{optional}; - if (my @available = get_available_packages($component, $in, @packages)) { + if (my @available = get_available_packages($component, $in->do_pkgs, @packages)) { log::explanations("Installing thirdparty packages ($component) " . join(', ', @available)); if ($in->do_pkgs->install(@available) && check_installed($component, $settings, $driver)) { return 1; -- cgit v1.2.1