diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2010-02-25 12:52:13 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2010-02-25 12:52:13 +0000 |
| commit | 51aaf2e1d28125ce85207526ca24cf95414b6430 (patch) | |
| tree | 700f7bdf9ab04949db25f3d4084de3f657cd796f /urpm | |
| parent | 8223d12fa5e64757d7c3defa1875777894160f76 (diff) | |
| download | urpmi-51aaf2e1d28125ce85207526ca24cf95414b6430.tar urpmi-51aaf2e1d28125ce85207526ca24cf95414b6430.tar.gz urpmi-51aaf2e1d28125ce85207526ca24cf95414b6430.tar.bz2 urpmi-51aaf2e1d28125ce85207526ca24cf95414b6430.tar.xz urpmi-51aaf2e1d28125ce85207526ca24cf95414b6430.zip | |
(add_distrib_media) disable non-free repository by default for Free
edition instead of not adding them (#40033)
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/media.pm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/urpm/media.pm b/urpm/media.pm index 9c79071f..c045d8b8 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -935,14 +935,6 @@ sub add_distrib_media { foreach my $media ($distribconf->listmedia) { my $media_name = $distribconf->getvalue($media, 'name') || ''; - my @media_types = split(':', $distribconf->getvalue($media, 'media_type')); - if ($product_id->{product} eq 'Free') { - if (member('non-free', @media_types)) { - $urpm->{log}(N("skipping non-free medium `%s'", $media)); - next; - } - } - if (my $media_arch = $distribconf->getvalue($media, 'arch')) { if (!URPM::archscore($media_arch)) { $urpm->{log}(N("skipping non compatible media `%s' (for %s)", @@ -957,6 +949,13 @@ sub add_distrib_media { } my $add_by_default = !$distribconf->getvalue($media, 'noauto'); + my @media_types = split(':', $distribconf->getvalue($media, 'media_type')); + if ($product_id->{product} eq 'Free') { + if (member('non-free', @media_types)) { + $urpm->{log}(N("ignoring non-free medium `%s'", $media)); + $add_by_default = 0; + } + } my $ignore; if ($options{ask_media}) { $options{ask_media}->($media_name, $add_by_default) or next; |