From 7099d39f24da93c87ebccde269f705d2d24e38a7 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@redhat.com>
Date: Fri, 4 Jun 2010 10:29:01 -0700
Subject: [PATCH] Don't do multilib gathering.

Anaconda won't install them, so why gather them?  Thanks to Seth Vidal
for the code.
---
 src/pypungi/__init__.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py
index 63d12d4c..b04ea18e 100644
--- a/src/pypungi/__init__.py
+++ b/src/pypungi/__init__.py
@@ -175,7 +175,18 @@ class Pungi(pypungi.PungiBase):
             yumarch = arch
 
         self.ayum.compatarch = yumarch
-        arches = yum.rpmUtils.arch.getArchList(yumarch)
+        # Filter out all the multilib arches, anaconda won't use them.
+        full_archlist = set(yum.rpmUtils.arch.getArchList(yumarch))
+        compat_archinfo = yum.rpmUtils.arch.getMultiArchInfo(yumarch)
+        if not compat_archinfo:
+            arches = list(full_archlist)
+        else:
+            compat_archlist = set(yum.rpmUtils.arch.getArchList(compat_archinfo[0]))
+            newarchlist = list(full_archlist.difference(compat_archlist))
+            if 'noarch' not in newarchlist:
+                newarchlist.append('noarch')
+            arches = newarchlist
+
         arches.append('src') # throw source in there, filter it later
 
         # deal with our repos