summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-05 17:37:21 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-05 17:37:21 +0000
commit370afa2d112d4aa35cc47f9d8418737b339982cd (patch)
tree719543bb31df7f11c888955e79a02bb2ed985356
parent90f2df14d2a485f1afbec5fb6ae3a080d3f003fb (diff)
downloaddrakx-370afa2d112d4aa35cc47f9d8418737b339982cd.tar
drakx-370afa2d112d4aa35cc47f9d8418737b339982cd.tar.gz
drakx-370afa2d112d4aa35cc47f9d8418737b339982cd.tar.bz2
drakx-370afa2d112d4aa35cc47f9d8418737b339982cd.tar.xz
drakx-370afa2d112d4aa35cc47f9d8418737b339982cd.zip
do not set security level to its own value on upgrade (mga#5147)
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cd994fcf3..c93f090a8 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- log install settings (mga#3467 & mga#5209)
+- do not set security level to its own value on upgrade (mga#5147)
Version 14.1 - 23 March 2012
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index c9d2dde5c..53e87f0c3 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -813,7 +813,7 @@ sub miscellaneousAfter {
addToBeDone {
addVarsInSh("$::prefix/etc/sysconfig/system", { META_CLASS => $o->{meta_class} });
- eval { install::any::set_security($o) };
+ eval { install::any::set_security($o) } if !$o->{isUpgrade};
} 'installPackages';
}