summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-03 18:10:59 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-03 18:10:59 +0000
commit94cbb25f0b18fafdc854468af2f9c90f045e14ec (patch)
tree79de06cba7aed942d0839280dac9e9153f1a86de
parent14f6cbafcbe36c9c74e8f4f7a4e7ca98ff33118d (diff)
downloadmgaonline-94cbb25f0b18fafdc854468af2f9c90f045e14ec.tar
mgaonline-94cbb25f0b18fafdc854468af2f9c90f045e14ec.tar.gz
mgaonline-94cbb25f0b18fafdc854468af2f9c90f045e14ec.tar.bz2
mgaonline-94cbb25f0b18fafdc854468af2f9c90f045e14ec.tar.xz
mgaonline-94cbb25f0b18fafdc854468af2f9c90f045e14ec.zip
(harvester,is_there_a_new_distributions) still check for new distro if
popup is disabled so that one can still performs it from menu
-rwxr-xr-xmdkapplet5
1 files changed, 2 insertions, 3 deletions
diff --git a/mdkapplet b/mdkapplet
index 23b976ea..7d1dbc1e 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -264,8 +264,6 @@ ugtk2::exit(0);
sub is_there_a_new_distributions() {
- return if $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} =~ /^TRUE$/i;
-
#- contact the following URL to retrieve the list of released distributions.
my $type = lc($product_id->{type}); $type =~ s/\s//g;
my $list = "http://api.mandriva.com/distributions/$type.$product_id->{arch}.list?product=$product_id->{product}";
@@ -333,7 +331,8 @@ sub harvester {
if ($state) {
logIt($state->{log});
$sub_state = $state->{status};
- go2State($new_distro_version ? 'new_distribution' : $sub_state);
+ go2State($new_distro_version && $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i ?
+ 'new_distribution' : $sub_state);
}
} elsif ($media_manager_pid && $media_manager_pid == $childpid) {
undef $media_manager_pid;