diff options
| author | Daniel Drake <dsd@laptop.org> | 2011-09-04 21:22:14 (GMT) |
|---|---|---|
| committer | Anish Mangal <anish@sugarlabs.org> | 2011-10-14 19:33:26 (GMT) |
| commit | e59c838527b39c11f9c278a9b29a253aa07bc497 (patch) | |
| tree | 2994dcc9a1e410bea0fe66d4125cfa672d72c1ff | |
| parent | 3d2747bbf95eb43f9950fb3ce8582590457f2769 (diff) | |
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.
| -rw-r--r-- | modules/repos/ksmain.50.repos.py | 8 |
1 files changed, 1 insertions, 7 deletions
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('-', '_') |