summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-11-24 00:55:42 +0000
committerThierry Vignaud <tv@mandriva.org>2008-11-24 00:55:42 +0000
commit6a49d794ead91da7ada807d3fc475cc75ba0cf02 (patch)
tree9aded86ed2b2554d3cfe452a4dee02a490465f01
parent8b1ec2cf28a54b7594f2a354b527f1d8cabba4bc (diff)
downloadmgaonline-6a49d794ead91da7ada807d3fc475cc75ba0cf02.tar
mgaonline-6a49d794ead91da7ada807d3fc475cc75ba0cf02.tar.gz
mgaonline-6a49d794ead91da7ada807d3fc475cc75ba0cf02.tar.bz2
mgaonline-6a49d794ead91da7ada807d3fc475cc75ba0cf02.tar.xz
mgaonline-6a49d794ead91da7ada807d3fc475cc75ba0cf02.zip
(add_media) there's no point checking for updates just after forking
off media manager since anyway urpmi db will be locked; (haverster) do it in the proper place, when media manager exits (was wrong since first intented in r244740 from 2008-09-04 which was: "(add_media) check again after adding update media")
-rw-r--r--NEWS1
-rwxr-xr-xmdkapplet2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 461140fe..f6a04173 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- mdkapplet
+ o really check again after adding update media
o update status once restricted media got added
- mdkapplet-restricted-helper
o make sure added media names match our naming policy
diff --git a/mdkapplet b/mdkapplet
index 3b0a5902..b4b2b31b 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -346,6 +346,7 @@ sub harvester {
}
} elsif ($media_manager_pid && $media_manager_pid == $childpid) {
undef $media_manager_pid;
+ $schedule_checks = 1;
}
push @pids, $childpid;
} while $childpid > 0;
@@ -424,7 +425,6 @@ sub add_media() {
return if $media_manager_pid;
log::explanations("Launching 'Software Media Manager'");
$media_manager_pid = fork_exec('/usr/sbin/edit-urpm-sources.pl', '--no-splash', if_($root, "--urpmi-root=$root"));
- silentCheck(); gtkflush();
}
sub installUpdates() {