diff options
| author | Olivier Thauvin <nanardon@mandriva.org> | 2007-07-05 13:55:37 +0000 |
|---|---|---|
| committer | Olivier Thauvin <nanardon@mandriva.org> | 2007-07-05 13:55:37 +0000 |
| commit | 587bb05fdae6ce2c0d1f316e71a27fb7efb3c9fa (patch) | |
| tree | 884eff1ed3742adde0b018db2916971dc777e317 | |
| parent | 370247ff9fb6fd690fdd2592a289345392dcb472 (diff) | |
| download | urpmi-587bb05fdae6ce2c0d1f316e71a27fb7efb3c9fa.tar urpmi-587bb05fdae6ce2c0d1f316e71a27fb7efb3c9fa.tar.gz urpmi-587bb05fdae6ce2c0d1f316e71a27fb7efb3c9fa.tar.bz2 urpmi-587bb05fdae6ce2c0d1f316e71a27fb7efb3c9fa.tar.xz urpmi-587bb05fdae6ce2c0d1f316e71a27fb7efb3c9fa.zip | |
- when adding media with --distrib, ignore incompatible media according arch
| -rw-r--r-- | urpm/media.pm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/urpm/media.pm b/urpm/media.pm index 15614ea3..a42d15ca 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -761,6 +761,13 @@ sub add_distrib_media { foreach my $media ($distribconf->listmedia) { my $media_name = $distribconf->getvalue($media, 'name') || ''; + if (my $media_arch = $distribconf->getvalue($media, 'arch')) { + if (!URPM::archscore($media_arch)) { + $urpm->{log}(N("skiping non compatible media `%s' (for %s)\n"), + $media, $media_arch); + next; + } + } my $add_by_default = !$distribconf->getvalue($media, 'noauto'); if ($options{ask_media}) { $options{ask_media}->($media_name, $add_by_default) or next; |