From 587bb05fdae6ce2c0d1f316e71a27fb7efb3c9fa Mon Sep 17 00:00:00 2001
From: Olivier Thauvin <nanardon@mandriva.org>
Date: Thu, 5 Jul 2007 13:55:37 +0000
Subject: - when adding media with --distrib, ignore incompatible media
 according arch

---
 urpm/media.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'urpm')

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;
-- 
cgit v1.2.1