[yum-commits] output.py

James Antill james at osuosl.org
Tue May 28 20:36:11 UTC 2013


 output.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit a3c07d85f045cee868a78405ffdd6e537158a99a
Author: James Antill <james at and.org>
Date:   Tue May 28 16:28:29 2013 -0400

    Add a fuzzy matcher for numbers in format_missing_requires. BZ 718245.

diff --git a/output.py b/output.py
index 6b9e9e2..38449bb 100755
--- a/output.py
+++ b/output.py
@@ -2887,6 +2887,18 @@ class DepSolveProgressCallBack:
                 done = True
                 msg += _('\n        %s') % yum.misc.prco_tuple_to_string(pkgtup)
             if not done:
+                nneedname = needname.translate(None, "0123456789")
+                if nneedname != needname:
+                    #  Sometimes things change numbers, so compare without.
+                    # Eg. libXYZ.so.0() libXYZ.so.1()
+                    for pkgtup in pkg.provides:
+                        name = pkgtup[0]
+                        name = name.translate(None, "0123456789")
+                        if name == nneedname:
+                            done = True
+                            pkgtup = yum.misc.prco_tuple_to_string(pkgtup)
+                            msg += _('\n       ~%s') % pkgtup
+            if not done:
                 msg += _('\n        Not found')
             return msg
 


More information about the Yum-commits mailing list