diff options
author | Olivier Blin <oblin@mandriva.com> | 2008-08-18 12:50:45 +0000 |
---|---|---|
committer | Olivier Blin <oblin@mandriva.com> | 2008-08-18 12:50:45 +0000 |
commit | d0a637b483e2790bd8abfddf615b47937c3d937b (patch) | |
tree | 25e3b31c3a4c0ff996b0c15ed3ea955a154b0650 /lib | |
parent | 99b32d052610c34703581a9137fa275d8b158f76 (diff) | |
download | drakx-net-d0a637b483e2790bd8abfddf615b47937c3d937b.tar drakx-net-d0a637b483e2790bd8abfddf615b47937c3d937b.tar.gz drakx-net-d0a637b483e2790bd8abfddf615b47937c3d937b.tar.bz2 drakx-net-d0a637b483e2790bd8abfddf615b47937c3d937b.tar.xz drakx-net-d0a637b483e2790bd8abfddf615b47937c3d937b.zip |
do not require interactive object in get_available_packages, just do_pkgs
Diffstat (limited to 'lib')
-rw-r--r-- | lib/network/thirdparty.pm | 8 |
1 files changed, 4 insertions, 4 deletions
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; |