[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH 2/3] 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.
---
 yuminstall.py |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/yuminstall.py b/yuminstall.py
index 784cfb1..82ba256 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."""
-- 
1.6.1.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]