summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-02-11 16:05:39 +0000
committerThierry Vignaud <tv@mandriva.org>2009-02-11 16:05:39 +0000
commitf80778e719165c404e4b011373fe673319ea59dd (patch)
tree5ab8df4544cc719146b232f3a94aaf126f0cf531
parent7b435ccfc69a354c2e2ad066690b96c6eca6578f (diff)
downloadmgaonline-f80778e719165c404e4b011373fe673319ea59dd.tar
mgaonline-f80778e719165c404e4b011373fe673319ea59dd.tar.gz
mgaonline-f80778e719165c404e4b011373fe673319ea59dd.tar.bz2
mgaonline-f80778e719165c404e4b011373fe673319ea59dd.tar.xz
mgaonline-f80778e719165c404e4b011373fe673319ea59dd.zip
(harvester) make more readable (needed for next commit)
-rwxr-xr-xmdkapplet9
1 files changed, 6 insertions, 3 deletions
diff --git a/mdkapplet b/mdkapplet
index 1a523972..1d47b90b 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -340,9 +340,12 @@ sub harvester {
if ($state) {
log::explanations($state->{log});
$sub_state = $state->{status};
- go2State($new_distro && $config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i
- && $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i ?
- 'new_distribution' : $sub_state);
+ if ($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 {
+ go2State($sub_state);
+ }
}
} elsif ($media_manager_pid && $media_manager_pid == $childpid) {
undef $media_manager_pid;