diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-03-16 21:54:46 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2019-03-16 23:07:11 +0000 |
| commit | 2a8045ba3957f82095af05bd62654946ac7bd6ec (patch) | |
| tree | de38a1003799b07e8d9e0659ba7c5d5f045a8d4e | |
| parent | 5ec6dcfa515e40d85e5c124b4694715e278a3c7a (diff) | |
| download | drakx-2a8045ba3957f82095af05bd62654946ac7bd6ec.tar drakx-2a8045ba3957f82095af05bd62654946ac7bd6ec.tar.gz drakx-2a8045ba3957f82095af05bd62654946ac7bd6ec.tar.bz2 drakx-2a8045ba3957f82095af05bd62654946ac7bd6ec.tar.xz drakx-2a8045ba3957f82095af05bd62654946ac7bd6ec.zip | |
installer: don't preselect Nonfree 32bit media (mga#23927)
For x86_64, the 32bit media are no longer enabled by default.
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index efec146f5..0a1ce52a5 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- don't preselect Nonfree 32bit media (mga#23927) - fix paths to Adwaita icons (changed in adwaita-icon-theme) Version 18.11 - 16 March 2019 diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index e8d905651..7952855cb 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -443,7 +443,7 @@ Enable a disabled Nonfree medium. sub enable_nonfree_media { my ($medium) = @_; - return if $medium->{name} !~ /Nonfree/ || !$medium->{ignore}; + return if $medium->{name} !~ /Nonfree/ || $medium->{name} =~ /32bit/ || !$medium->{ignore}; log::l("preselecting $medium->{name}"); $medium->{temp_enabled} = 1; } |