summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rwxr-xr-xmdkapplet17
2 files changed, 12 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index f5ed718d..12511561 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
o add version to distribution list requests
o fix a crash (#55346)
o fix adding restricted media (#55320)
+ o warn about new distro or no more supported distro only after all
+ updates were applied
- mdkapplet-upgrade-helper
o make sure utf8.pm is loaded before starting an upgrade (#55090)
diff --git a/mdkapplet b/mdkapplet
index 1070f52d..6af9a19c 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -386,18 +386,21 @@ sub harvester {
if ($state) {
log::explanations($state->{log});
$sub_state = $state->{status};
- if ($no_more_supported) {
+ if ($sub_state eq 'locked') {
+ $locked_count++;
+ $sub_state = 'loop_locked' if $locked_count > 10;
+ } else {
+ $locked_count = 0;
+ }
+ # 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) {
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) {
go2State('new_distribution');
} else {
- if ($sub_state eq 'locked') {
- $locked_count++;
- $sub_state = 'loop_locked' if $locked_count > 10;
- } else {
- $locked_count = 0;
- }
go2State($sub_state);
}
}