From bb6a6b14d66b6d261d73c10840b8ec2ae1589d1a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 11 May 2015 04:10:04 -0400 Subject: respect auto_inst media selection (mga#12299) --- perl-install/install/any.pm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'perl-install/install/any.pm') diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 0a2675065..82f700f15 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -580,6 +580,14 @@ sub setPackages { } install::pkgs::start_pushing_error(); + + # in auto-install mode, we enforce selected media, else we respect media.cfg's default: + if ($::auto_install && !is_empty_array_ref($o->{enabled_media})) { + # respect enabled/disabled media selection: + foreach my $medium (@{$urpm->{media}}) { + $medium->{temp_enabled} = member($medium->{name}, @{$o->{enabled_media}}); + } + } media_screen($o) if !$::auto_install && !$::o->{match_all_hardware}; enable_choosen_media($o); my @choosen_media = map { $_->{name} } grep { !$_->{ignore} } @{$urpm->{media}}; -- cgit v1.2.1