summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--urpm/media.pm2
-rwxr-xr-xurpmi15
3 files changed, 4 insertions, 15 deletions
diff --git a/NEWS b/NEWS
index 55c51065..ecef10e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- urpmi
+ o fix --auto-update ignoring --media and default-media (#45097)
- gurpmi
o display the download errors
o log all urpmi logs
diff --git a/urpm/media.pm b/urpm/media.pm
index e0e3ca5a..1cf99072 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -641,7 +641,7 @@ sub _auto_update_media {
$options{callback} = delete $options{download_callback};
my $errors;
- foreach (grep { $_->{force_auto_update} || _is_remote_virtual($_) }
+ foreach (grep { $_->{force_auto_update} || _is_remote_virtual($_) || $urpm->{options}{'auto-update'} }
non_ignored_media($urpm, $options{update})) {
_update_medium($urpm, $_, %options) or $errors++;
}
diff --git a/urpmi b/urpmi
index 2205f259..4238159f 100755
--- a/urpmi
+++ b/urpmi
@@ -345,20 +345,7 @@ if ($urpm->{root}) {
$urpm->{options}{'priority-upgrade'} = '' if !$ENV{TESTING_priority_upgrade};
}
if ($auto_update && !$bug && !$env) {
- #- For translators : there are several media here
- $urpm->{log}(N("Updating media...\n"));
- urpm::media::read_config($urpm, '');
- urpm::media::update_media($urpm,
- all => 1,
- callback => \&urpm::download::sync_logger,
- quiet => $options{verbose} < 0,
- nomd5sum => $nomd5sum,
- forcekey => $forcekey,
- );
- delete $urpm->{media};
- $urpm->{depslist} = [];
- $urpm->{provides} = {};
- $urpm->{obsoletes} = {};
+ $urpm->{options}{'auto-update'} = 1;
}
urpm::media::configure($urpm,