[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/packages.py

[Ville Skyttä]

 yum/packages.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c2a6260abbc34ff94024f117fdb10277bd9b02ef
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Apr 7 22:24:17 2011 +0300

    Avoid unneeded file/dir/ghost list lookups and list concat when dumping deps as XML.

diff --git a/yum/packages.py b/yum/packages.py
index e22fd02..264aa9a 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -1151,8 +1151,10 @@ class YumAvailablePackage(PackageObject, RpmBase):
             if name.startswith('rpmlib('):
                 continue
             # this drops out requires that the pkg provides for itself.
-            if name in self.provides_names or name in self.filelist + \
-                                                self.dirlist + self.ghostlist:
+            if name in self.provides_names or \
+                    (name.startswith('/') and \
+                         (name in self.filelist or name in self.dirlist or
+                          name in self.ghostlist)):
                 if not flags:
                     continue
                 else:
commit 2b615f0844600c7ca0f9379872160c505885e879
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Apr 7 21:41:19 2011 +0300

    Avoid unneeded returnFileEntries() and list concat for provides_for file deps.

diff --git a/yum/packages.py b/yum/packages.py
index 5bc8ec9..e22fd02 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -497,11 +497,9 @@ class RpmBase(object):
             else:
                 pri_only = False
 
-            files = self.returnFileEntries('file', pri_only) + \
-                    self.returnFileEntries('dir', pri_only) + \
-                    self.returnFileEntries('ghost', pri_only)
-            if reqtuple[0] in files:
-                return True
+            for ftype in ('file', 'dir', 'ghost'):
+                if reqtuple[0] in self.returnFileEntries(ftype, pri_only):
+                    return True
         
         return False