summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/do_pkgs.pm2
-rw-r--r--perl-install/install/NEWS1
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)