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

[skvidal at osuosl.org]

 yum/packages.py |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 5928358cb8fd9d1d7d00940ba3381462d35222b1
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 28 12:02:51 2009 -0400

    cleanup a few debug prints and check against ghostlists as well.

diff --git a/yum/packages.py b/yum/packages.py
index 891bd6d..c3a39c6 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -999,13 +999,12 @@ 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:
+            if name in self.provides_names or name in self.filelist + \
+                                                self.dirlist + self.ghostlist:
                 if not flags:
-                    print 'skipping req %s' % name
                     continue
                 else:
                     if self.checkPrco('provides', (name, flags, (e,v,r))):
-                        print 'skipping req w/flags %s' % name
                         continue
             prcostring = '''      <rpm:entry name="%s"''' % misc.to_xml(name, attrib=True)
             if flags:
commit dc8267b371dc04803e714923296f06fd5b130af9
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 28 11:32:39 2009 -0400

    also remove filerequires if we have the file

diff --git a/yum/packages.py b/yum/packages.py
index d9baa59..891bd6d 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -999,7 +999,7 @@ 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:
+            if name in self.provides_names or name in self.filelist + self.dirlist:
                 if not flags:
                     print 'skipping req %s' % name
                     continue
commit 7ba8cd098fe2f915b8f8b6822066d23b59e3bff8
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 28 11:28:43 2009 -0400

    - don't include requirements in the metadata when the pkg provides it
      for itself.

diff --git a/yum/packages.py b/yum/packages.py
index 71430fd..d9baa59 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -998,6 +998,15 @@ class YumAvailablePackage(PackageObject, RpmBase):
         for (name, flags, (e,v,r),pre) in mylist:
             if name.startswith('rpmlib('):
                 continue
+            # this drops out requires that the pkg provides for itself.
+            if name in self.provides_names:
+                if not flags:
+                    print 'skipping req %s' % name
+                    continue
+                else:
+                    if self.checkPrco('provides', (name, flags, (e,v,r))):
+                        print 'skipping req w/flags %s' % name
+                        continue
             prcostring = '''      <rpm:entry name="%s"''' % misc.to_xml(name, attrib=True)
             if flags:
                 prcostring += ''' flags="%s"''' % misc.to_xml(flags, attrib=True)