Ticket #296: yum-3.2.x-sourcerpm_installed_check.patch

depsolve.py

@@ -79 +79 @@
-
-        self.installedFileRequires = None
-        self.installedUnresolvedFileRequires = None
+        self.installedSourceRPMS = []
-
-    def doTsSetup(self):
-        warnings.warn(_('doTsSetup() will go away in a future version of Yum.\n'),
@@ -1010 +1011 @@
-                return False
-            return x.sourcerpm == y.sourcerpm
-
+        def _sourcerpm_installed(x):
+            if not hasattr(x, 'sourcerpm'):
+                return False
+            return x.sourcerpm in self.installedSourceRPMS 
+
-        def _compare_arch_distance(x, y, req_compare_arch):
-            # take X and Y package objects
-            # determine which has a closer archdistance to compare_arch
@@ -1037 +1043 @@
-        pkgresults = {}
-        ipkgresults = {}
-
+        # for _sourcerpm_installed() comparison.      
+        for installed_po in self.rpmdb.returnPackages():
+            if installed_po.sourcerpm not in self.installedSourceRPMS:
+                self.installedSourceRPMS.append(installed_po.sourcerpm)
+
-        for pkg in pkgs:
-            pkgresults[pkg] = 0
-            if self.rpmdb.contains(pkg.name):
@@ -1113 +1124 @@
-                self.verbose_logger.log(logginglevels.DEBUG_4,
-                    _('common sourcerpm %s and %s' % (po, reqpo)))
-                pkgresults[po] += 20
+            if _sourcerpm_installed(po):
+                self.verbose_logger.log(logginglevels.DEBUG_4,
+                    _('sourcerpm is installed %s' % po))
+                pkgresults[po] += 20
-            if reqpo:
-                cpl = _common_prefix_len(po.name, reqpo.name)
-                if cpl > 2: