summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-05 17:37:27 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-05 17:37:27 +0000
commitf225445b222eb408d318a4af15bd62ca0c38acaf (patch)
tree8f71102436fd316aeb8d405ca0e1834524fa9e0d
parenta13e99fa906bbee2ecaf51a6584e94b61e21c786 (diff)
downloaddrakx-f225445b222eb408d318a4af15bd62ca0c38acaf.tar
drakx-f225445b222eb408d318a4af15bd62ca0c38acaf.tar.gz
drakx-f225445b222eb408d318a4af15bd62ca0c38acaf.tar.bz2
drakx-f225445b222eb408d318a4af15bd62ca0c38acaf.tar.xz
drakx-f225445b222eb408d318a4af15bd62ca0c38acaf.zip
do not offer to select the security level in summary if msec is not installed
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 711f5a3a3..ab9405c79 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- log install settings (mga#3467 & mga#5209)
- do not set security level to its own value on upgrade (mga#5147)
- do not crash if msec isn't installed
+- do not offer to select the security level in summary if msec is not installed
Version 14.1 - 23 March 2012
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 6c369dbf6..f30dbec2b 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -984,7 +984,7 @@ sub summary {
install::any::set_security($o);
}
},
- };
+ } if -x "$::prefix/usr/sbin/msec";
push @l, {
group => N("Security"),