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

[skvidal at osuosl.org]

 yum/packages.py |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 1e83ec11cf3d4237f5fec21dbb8a548a4ede39b3
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Mar 27 16:37:32 2009 -0400

    make sure prereqs are looked up properly in newer-ish rpm

diff --git a/yum/packages.py b/yum/packages.py
index bb43b6c..4783b3e 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -1172,13 +1172,12 @@ class YumHeaderPackage(YumAvailablePackage):
            is a pre-requires or a not"""
         # FIXME this should probably be put in rpmUtils.miscutils since 
         # - that's what it is
-        newflag = flag
         if flag is not None:
-            newflag = flag & rpm.RPMSENSE_PREREQ
-            if newflag == rpm.RPMSENSE_PREREQ:
+            # Note: RPMSENSE_PREREQ == 0 since rpm-4.4'ish
+            if flag & (rpm.RPMSENSE_PREREQ |
+                       rpm.RPMSENSE_SCRIPT_PRE |
+                       rpm.RPMSENSE_SCRIPT_POST):
                 return 1
-            else:
-                return 0
         return 0
 
     def _requires_with_pre(self):