[releng] find_unblocked_orphans: Fix provider ignoring

Till Maas till at fedoraproject.org
Tue May 12 20:41:02 UTC 2015


commit 1410e282f8368f80fc83bacfcb635dc7e1e5e6f9
Author: Till Maas <opensource at till.name>
Date:   Tue May 12 22:25:39 2015 +0200

    find_unblocked_orphans: Fix provider ignoring

 scripts/find_unblocked_orphans.py |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/scripts/find_unblocked_orphans.py b/scripts/find_unblocked_orphans.py
index 13c1a3c..9dd39ef 100755
--- a/scripts/find_unblocked_orphans.py
+++ b/scripts/find_unblocked_orphans.py
@@ -357,8 +357,9 @@ class DepChecker(object):
         """ Return packages depending on packages built from SRPM ``srpmname``
             that are built from different SRPMS not specified in ``ignore``.
 
-            :param ignore: list of SRPMs of packages that will not be returned
-                as dependent packages.
+            :param ignore: list of binary package names that will not be
+                returned as dependent packages or considered as alternate
+                providers
             :type ignore: list() of str()
 
             :returns: OrderedDict dependent_package: list of requires only
@@ -413,7 +414,11 @@ class DepChecker(object):
             for pkg in self.yumbase.pkgSack.searchProvides(base_provide):
                 # FIXME: might miss broken dependencies in case the other
                 # provider depends on a to-be-removed package as well
-                if pkg.sourcerpm.rsplit('-', 2)[0] not in ignore:
+                if pkg.name in ignore:
+                    #sys.stderr.write("Ignoring provider package %s\n" %
+                    #                  pkg.name)
+                    pass
+                else:
                     break
             else:
                 for dependent_pkg in self.yumbase.pkgSack.searchRequires(


More information about the rel-eng mailing list