From e59c838527b39c11f9c278a9b29a253aa07bc497 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Sun, 04 Sep 2011 21:22:14 +0000
Subject: repos: consider arch when building exclude list

This avoids the situation where a i686 xulrunner RPM causes xulrunner
to be added to the exclude list on ARM. As though there is no
xulrunner ARM RPM present in the OLPC repositories, this resulted in
xulrunner not being able to be found in any repository.

Fixed by only adding arch-relevant packages to the exclude list.
---
diff --git a/modules/repos/ksmain.50.repos.py b/modules/repos/ksmain.50.repos.py
index 7a794d2..3d39d66 100644
--- a/modules/repos/ksmain.50.repos.py
+++ b/modules/repos/ksmain.50.repos.py
@@ -27,12 +27,7 @@ def add_to_excludes(baseurl, addexcludes):
     data = fd.read()
     fd.close()
     fd = GzipFile(fileobj=StringIO(data))
-    ooblib.add_packages_from_xml(fd, addexcludes)
-
-excludepkgs = set()
-addexcludes = ooblib.read_config('repos', 'add_excludes_to')
-fedora = ooblib.read_config('repos', 'fedora')
-fver = ooblib.read_config('global', 'fedora_release').strip()
+    ooblib.add_packages_from_xml(fd, addexcludes, farch)
 
 # clean up addexcludes list
 if addexcludes is not None:
@@ -86,7 +81,6 @@ def get_fedora_repo(name, version, arch):
     return "mirrorlist", FEDORA_URLS[name] % { 'version': version, 'arch': arch }
 
 if fedora is not None:
-    farch = ooblib.read_config('repos', 'fedora_arch').strip()
     for repo in fedora.split(','):
 <<<<<<< HEAD
         repo = repo.strip().replace('-', '_')
--
cgit v0.9.1