summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-05 17:37:24 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-05 17:37:24 +0000
commita13e99fa906bbee2ecaf51a6584e94b61e21c786 (patch)
tree38f7e9a8f8c1eba30b710985317d851f67b9e3f7
parent370afa2d112d4aa35cc47f9d8418737b339982cd (diff)
downloaddrakx-a13e99fa906bbee2ecaf51a6584e94b61e21c786.tar
drakx-a13e99fa906bbee2ecaf51a6584e94b61e21c786.tar.gz
drakx-a13e99fa906bbee2ecaf51a6584e94b61e21c786.tar.bz2
drakx-a13e99fa906bbee2ecaf51a6584e94b61e21c786.tar.xz
drakx-a13e99fa906bbee2ecaf51a6584e94b61e21c786.zip
do not crash if msec isn't installed
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/any.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index c93f090a8..711f5a3a3 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- 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
Version 14.1 - 23 March 2012
diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm
index 8cd9159d5..957b57f30 100644
--- a/perl-install/install/any.pm
+++ b/perl-install/install/any.pm
@@ -1302,6 +1302,7 @@ sub disable_user_view() {
sub set_security {
my ($o) = @_;
require security::various;
+ return if !-x "$::prefix/usr/sbin/msec";
security::level::set($o->{security});
security::various::config_security_user($::prefix, $o->{security_user});
}