summaryrefslogtreecommitdiffstats
path: root/perl-install/do_pkgs.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-05-16 11:47:07 +0000
committerThierry Vignaud <tv@mageia.org>2013-05-16 11:47:07 +0000
commitbe1d69418fda6e16422d634c59b54375bfa7a897 (patch)
tree6f0855da888f5191a5f53c23c8dd43ecedfd56f0 /perl-install/do_pkgs.pm
parent4ad6b2fe404e2528457e6b898089d2ea00e32207 (diff)
downloaddrakx-be1d69418fda6e16422d634c59b54375bfa7a897.tar
drakx-be1d69418fda6e16422d634c59b54375bfa7a897.tar.gz
drakx-be1d69418fda6e16422d634c59b54375bfa7a897.tar.bz2
drakx-be1d69418fda6e16422d634c59b54375bfa7a897.tar.xz
drakx-be1d69418fda6e16422d634c59b54375bfa7a897.zip
fix offering to install shorewall & shorewall-ipv6 when already installed
we could have provided full paths in drakx-net but it's simpler to make ensure_files_are_installed() behave like ensure_binary_is_installed() and search for file side effect: a warning in mousedrake
Diffstat (limited to 'perl-install/do_pkgs.pm')
-rw-r--r--perl-install/do_pkgs.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/do_pkgs.pm b/perl-install/do_pkgs.pm
index cb33c6ab8..a15642d82 100644
--- a/perl-install/do_pkgs.pm
+++ b/perl-install/do_pkgs.pm
@@ -72,7 +72,7 @@ sub ensure_binary_is_installed {
sub ensure_files_are_installed {
my ($do, $pkgs, $b_auto) = @_;
- my @not_installed = map { my ($package, $file) = @$_; if_(!-e "$::prefix$file", $package) } @$pkgs;
+ my @not_installed = map { my ($package, $file) = @$_; if_(!whereis_binary($file, $::prefix), $package) } @$pkgs;
return if !@not_installed;
$do->in->ask_okcancel(N("Warning"), N("The following packages need to be installed:\n") . join(', ', @not_installed), 1)