summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-05-21 09:22:35 +0000
committerThierry Vignaud <tv@mageia.org>2011-05-21 09:22:35 +0000
commitb50fc8de936702b97586e8f4bdf496866c17aeff (patch)
treea1cb6dd06830e1c0e71027044fd7afb215997968
parentac09c9869446b528d6af82f29c5256841842d160 (diff)
downloadmgaonline-b50fc8de936702b97586e8f4bdf496866c17aeff.tar
mgaonline-b50fc8de936702b97586e8f4bdf496866c17aeff.tar.gz
mgaonline-b50fc8de936702b97586e8f4bdf496866c17aeff.tar.bz2
mgaonline-b50fc8de936702b97586e8f4bdf496866c17aeff.tar.xz
mgaonline-b50fc8de936702b97586e8f4bdf496866c17aeff.zip
(installUpdates) handle both MageiaUpdate & MandrivaUpdate
-rw-r--r--NEWS2
-rwxr-xr-xmgaapplet3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a4eb3a00..52329be8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- handle both MageiaUpdate & MandrivaUpdate
+
Version 2.77.25 - 13 Mae 2010, Thierry Vignaud
- use https protocol instead of http in order to retrieve distro list
diff --git a/mgaapplet b/mgaapplet
index 730e7cf7..3b504e27 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -686,7 +686,8 @@ sub add_media() {
sub installUpdates() {
return if $mdv_update_pid;
log::explanations(N_("Launching MageiaUpdate\n"));
- $mdv_update_pid = fork_exec('MageiaUpdate', '--no-media-update', '--no-confirmation', '--no-splash',
+ my $program = find { -x "/usr/bin/$_" } qw(MageiaUpdate MandrivaUpdate);
+ $mdv_update_pid = fork_exec($program, '--no-media-update', '--no-confirmation', '--no-splash',
if_($root, "--urpmi-root=$root"));
silentCheck(); gtkflush();
}