summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-10-10 11:35:01 +0000
committerThierry Vignaud <tv@mandriva.org>2008-10-10 11:35:01 +0000
commita725a2002345e19565f1ec0c129d5fd0f2cbe5bf (patch)
tree26841d37321f5cfabc941d9f852495cb726f2605
parentfdb979c4f490fa257c64f23bb1164972e90628fc (diff)
downloadmgaonline-a725a2002345e19565f1ec0c129d5fd0f2cbe5bf.tar
mgaonline-a725a2002345e19565f1ec0c129d5fd0f2cbe5bf.tar.gz
mgaonline-a725a2002345e19565f1ec0c129d5fd0f2cbe5bf.tar.bz2
mgaonline-a725a2002345e19565f1ec0c129d5fd0f2cbe5bf.tar.xz
mgaonline-a725a2002345e19565f1ec0c129d5fd0f2cbe5bf.zip
(harvester) do not display gurpmi log errors when done installing
updates, only do it for distribution upgrade (no sense doing it for regular updates when there's no such logs)
-rw-r--r--NEWS4
-rwxr-xr-xmdkapplet16
2 files changed, 13 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 1f403106..b042daac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- mdkapplet
+ o do not display gurpmi log errors when done installing updates,
+ only do it for distribution upgrade
+
Version 2.54 - 10 October 2008
- mdkapplet
diff --git a/mdkapplet b/mdkapplet
index f042030c..c1ad3996 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -331,13 +331,15 @@ sub harvester {
$mdvupdate_returned = 1;
}
undef $refork_gurpmi;
- if ($status) {
- ugtk2::ask_warn(N("Error"),
- N("Installation failed"),
- N("Installation logs can be found in '%s'", $log_file)
- );
- } elsif ($state_global eq 'new_distribution') {
- upgrade_distro_congratulations();
+ if ($state_global eq 'new_distribution') {
+ if ($status) {
+ ugtk2::ask_warn(N("Error"),
+ N("Installation failed"),
+ N("Installation logs can be found in '%s'", $log_file)
+ );
+ } else {
+ upgrade_distro_congratulations();
+ }
}
} elsif ($checker_pid && $checker_pid == $childpid) {
undef $checker_pid;