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

[James Antill]

 rpmUtils/miscutils.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 34c0c0e226ff8be78c2dc481334ab7e0a801bd5b
Author: James Antill <james at and.org>
Date:   Tue Jun 23 17:53:52 2009 -0400

    Revert "Do not format flags if no version is passed to formatRequire."
    
    This reverts commit 201776c3a518ecfc3399887e63326ad81448e05d.
    
     This isn't right ... Eg. =>, (None, None, None) VS. < (1, 2, 3) is
    false.

diff --git a/rpmUtils/miscutils.py b/rpmUtils/miscutils.py
index 83026d6..4ad72d9 100644
--- a/rpmUtils/miscutils.py
+++ b/rpmUtils/miscutils.py
@@ -341,7 +341,7 @@ def rpm2cpio(fdno, out=sys.stdout, bufsize=2048):
 def formatRequire (name, version, flags):
     s = name
     
-    if flags and version:
+    if flags:
         if flags & (rpm.RPMSENSE_LESS | rpm.RPMSENSE_GREATER |
                     rpm.RPMSENSE_EQUAL):
             s = s + " "
@@ -351,7 +351,8 @@ def formatRequire (name, version, flags):
                 s = s + ">"
             if flags & rpm.RPMSENSE_EQUAL:
                 s = s + "="
-            s = "%s %s" % (s, version)
+            if version:
+                s = "%s %s" %(s, version)
     return s
     
 def flagToString(flags):