summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageia.org>2023-10-13 08:23:40 +0200
committerPapoteur <papoteur@mageia.org>2023-10-13 08:23:40 +0200
commit91243db8eebb41f6a3dfa03b05b979b2fe237fc9 (patch)
tree4ad36a209df902bcd83f7497817845b839291320
parent71f37c13ed6e048475dae21823b3f52f651d6293 (diff)
downloadmgaonline-91243db8eebb41f6a3dfa03b05b979b2fe237fc9.tar
mgaonline-91243db8eebb41f6a3dfa03b05b979b2fe237fc9.tar.gz
mgaonline-91243db8eebb41f6a3dfa03b05b979b2fe237fc9.tar.bz2
mgaonline-91243db8eebb41f6a3dfa03b05b979b2fe237fc9.tar.xz
mgaonline-91243db8eebb41f6a3dfa03b05b979b2fe237fc9.zip
- don't rely on PATH to choose urpmi.update in sbin or bin (mga#32354)
-rwxr-xr-xmgaapplet-update-checker2
-rwxr-xr-xmgaapplet-upgrade-helper4
2 files changed, 3 insertions, 3 deletions
diff --git a/mgaapplet-update-checker b/mgaapplet-update-checker
index 7a8a6bb8..31ccd8f7 100755
--- a/mgaapplet-update-checker
+++ b/mgaapplet-update-checker
@@ -52,7 +52,7 @@ checker_exit('locked') if $will_not_update_media;
my $is_it_a_devel_distro = is_it_a_devel_distro();
my $media = $is_it_a_devel_distro ? '-a' : '--update';
-if (!run_program::run('urpmi.update', $media, if_($root, "--urpmi-root=$root"))) {
+if (!run_program::run('/usr/binurpmi.update', $media, if_($root, "--urpmi-root=$root"))) {
checker_exit('error_updating') if $will_not_update_media;
}
diff --git a/mgaapplet-upgrade-helper b/mgaapplet-upgrade-helper
index d0e1d8f4..dac61180 100755
--- a/mgaapplet-upgrade-helper
+++ b/mgaapplet-upgrade-helper
@@ -332,10 +332,10 @@ sub fork_gurpmi {
}
sub update_media() {
- run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '-a');
+ run_program::run('/usr/bin/urpmi.update', if_($root, '--urpmi-root', $root), '-a');
}
sub enable_media {
my ($repos) = @_;
- run_program::run('urpmi.update', if_($root, '--urpmi-root', $root), '--no-ignore', "$repos Release", "$repos Updates");
+ run_program::run('/usr/bin/urpmi.update', if_($root, '--urpmi-root', $root), '--no-ignore', "$repos Release", "$repos Updates");
}