diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-05-16 11:47:07 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-05-16 11:47:07 +0000 |
| commit | be1d69418fda6e16422d634c59b54375bfa7a897 (patch) | |
| tree | 6f0855da888f5191a5f53c23c8dd43ecedfd56f0 | |
| parent | 4ad6b2fe404e2528457e6b898089d2ea00e32207 (diff) | |
| download | drakx-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
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/do_pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index b0b700c4c..8f95cf1fb 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- fix offering to install shorewall & shorewall-ipv6 when already installed + Version 15.53 - 15 May 2013 - logdrake: 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) diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index a5b418007..8d8ade1f0 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,6 @@ - do not enable legacy sysvinit scripts that no longer exist (mga#10084) - do not enable to pick xguest (mga#9750) +- fix offering to install shorewall & shorewall-ipv6 when already installed Version 15.52 - 15 May 2013 - fix displaying release notes while installing (mga#10087) |