summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2010-02-03 23:43:13 +0000
committerThierry Vignaud <tv@mandriva.org>2010-02-03 23:43:13 +0000
commit0bb978d0cf076282eadba73ef978a77fddc0b6bf (patch)
tree565b2cdc6a573bdfbba263489d1b4879cf0b33da
parenta0375d3066b18abd6db187d4b4612aaa5af14ccc (diff)
downloadmgaonline-0bb978d0cf076282eadba73ef978a77fddc0b6bf.tar
mgaonline-0bb978d0cf076282eadba73ef978a77fddc0b6bf.tar.gz
mgaonline-0bb978d0cf076282eadba73ef978a77fddc0b6bf.tar.bz2
mgaonline-0bb978d0cf076282eadba73ef978a77fddc0b6bf.tar.xz
mgaonline-0bb978d0cf076282eadba73ef978a77fddc0b6bf.zip
(process_state, no_more_supported_choice) display "no more supportion"
dialog only once
-rw-r--r--NEWS1
-rwxr-xr-xmdkapplet4
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ea8ff978..11c5f201 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- mdkapplet-extended-maintenance-helper
o add a 'Lifetime policy' button
+ o display 'no more supportion' dialog only once
Version 2.77.15.13 - 3 February 2010, Thierry Vignaud
diff --git a/mdkapplet b/mdkapplet
index 5cc28022..0bc6a06e 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -363,7 +363,8 @@ sub process_state {
# busy critical delayed disabled disconnected locked loop_locked new_distribution no_enabled_medium no_enterprise_update_medium no_more_supported no_update_medium notsupported okay unconfigured_restricted_media update
if (!member($sub_state, qw(okay))) {
go2State($sub_state);
- } elsif ($no_more_supported && !text2bool($config{EXTENDED_SUPPORT})) {
+ } elsif ($no_more_supported && !text2bool($config{EXTENDED_SUPPORT})
+ && !text2bool($local_config{EXTENDED_SUPPORT_OFFERED})) {
go2State('no_more_supported');
} elsif ($no_more_supported && text2bool($config{EXTENDED_SUPPORT})
&& !text2bool($local_config{EXTENDED_SUPPORT_SPLASHED}
@@ -560,6 +561,7 @@ sub no_more_supported_choice() {
my $res = fill_n_run_portable_dialog($w, \@widgets);
+ setVar('EXTENDED_SUPPORT_OFFERED', bool2yesno(1));
setVar('DO_NOT_ASK_FOR_NO_MORE_SUPPORTED', bool2text($warn_me));
$local_config{DO_NOT_ASK_FOR_NO_MORE_SUPPORTED} = bool2text($warn_me);
if ($res) {