diff options
author | Chris Lumens <clumens@redhat.com> | 2009-06-05 13:22:39 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2009-06-05 16:07:05 -0400 |
commit | 7ad46647979c293f7e422c7b435590e762b6bea5 (patch) | |
tree | db170671774072b378a6d7d137dec16115d05a33 /yuminstall.py | |
parent | 83cdf26880c972a2d8277a2a91159808aee7c69f (diff) | |
download | anaconda-7ad46647979c293f7e422c7b435590e762b6bea5.tar.gz anaconda-7ad46647979c293f7e422c7b435590e762b6bea5.tar.xz anaconda-7ad46647979c293f7e422c7b435590e762b6bea5.zip |
Remove the name check on driver disk packages (#472951).
Driver packages can now include a version number or other random information
in the Name part of the NEVRA, so we can't count on the name matching
kmod-drivername-ext anymore. Luckily, driver RPMs now include more sensible
Provides: so we no longer require the extra name check.
Diffstat (limited to 'yuminstall.py')
-rw-r--r-- | yuminstall.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/yuminstall.py b/yuminstall.py index 784cfb1f5..82ba256de 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -1206,9 +1206,9 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon for (path, name) in anaconda.id.extraModules: if ext != "": - moduleProvides = "kmod-%s-%s" % (name, ext) + moduleProvides = "dud-%s-%s" % (name, ext) else: - moduleProvides = "%s-kmod" % name + moduleProvides = "dud-%s" % name pkgs = self.ayum.returnPackagesByDep(moduleProvides) @@ -1216,14 +1216,8 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon log.warning("Didn't find any package providing module %s" % name) for pkg in pkgs: - if ext == "" and pkg.name == "kmod"+name: - log.info("selecting package %s for module %s" % (pkg.name, name)) - self.ayum.install(po=pkg) - elif ext != "" and pkg.name.find("-"+ext) != -1: - log.info("selecting package %s for module %s" % (pkg.name, name)) - self.ayum.install(po=pkg) - else: - continue + log.info("selecting package %s for module %s" % (pkg.name, name)) + self.ayum.install(po=pkg) def selectBestKernel(self, anaconda): """Find the best kernel package which is available and select it.""" |