summaryrefslogtreecommitdiffstats
path: root/mdkapplet
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-01-18 16:02:51 +0000
committerThierry Vignaud <tv@mandriva.org>2010-01-18 16:02:51 +0000
commitc891f54de3f345d088725cd4ea4eaa267dfcf272 (patch)
tree5241cb55474342f3478dacc21073d8b4045e80f0 /mdkapplet
parent503777c643d4ac2875341df39517c7879d1e155f (diff)
downloadmgaonline-c891f54de3f345d088725cd4ea4eaa267dfcf272.tar
mgaonline-c891f54de3f345d088725cd4ea4eaa267dfcf272.tar.gz
mgaonline-c891f54de3f345d088725cd4ea4eaa267dfcf272.tar.bz2
mgaonline-c891f54de3f345d088725cd4ea4eaa267dfcf272.tar.xz
mgaonline-c891f54de3f345d088725cd4ea4eaa267dfcf272.zip
(is_false) fix accepting values vritten by configurator (#56348)
Diffstat (limited to 'mdkapplet')
-rwxr-xr-xmdkapplet9
1 files changed, 7 insertions, 2 deletions
diff --git a/mdkapplet b/mdkapplet
index fab05682..12af7052 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -366,6 +366,11 @@ sub clean_distro_cache() {
undef $no_more_supported;
}
+sub is_false {
+ my ($s) = @_;
+ !text2bool($s) && $s != 1;
+}
+
# Signal management
sub harvester {
my ($_signame, $_clean) = @_;
@@ -396,8 +401,8 @@ sub harvester {
go2State($sub_state);
} elsif ($no_more_supported) {
go2State('no_more_supported');
- } elsif ($new_distro && $config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i
- && $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i) {
+ } elsif ($new_distro && is_false($config{DO_NOT_ASK_FOR_DISTRO_UPGRADE})
+ && is_false($local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE})) {
go2State('new_distribution');
} else {
go2State($sub_state);