[yum-cvs] yum/yum misc.py,1.25,1.26

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv17058/yum

Modified Files:
	misc.py 
Log Message:
split out conversion of version tuple -> string, use it


Index: misc.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/misc.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- misc.py	3 Feb 2007 22:04:11 -0000	1.25
+++ misc.py	14 Feb 2007 17:07:23 -0000	1.26
@@ -308,23 +308,27 @@
             ret.append(pkg)
     return ret
 
+def version_tuple_to_string(evrTuple):
+    (e, v, r) = evrTuple
+    s = ""
+    
+    if e not in [0, '0', None]:
+        s += '%s:' % e
+    if v is not None:
+        s += '%s' % v
+    if r is not None:
+        s += '-%s' % r
+    return s
+
 def prco_tuple_to_string(prcoTuple):
     """returns a text string of the prco from the tuple format"""
     
-    (name, flag, (e, v, r)) = prcoTuple
+    (name, flag, evr) = prcoTuple
     flags = {'GT':'>', 'GE':'>=', 'EQ':'=', 'LT':'<', 'LE':'<='}
     if flag is None:
         return name
     
-    base = '%s %s ' % (name, flags[flag])
-    if e not in [0, '0', None]:
-        base += '%s:' % e
-    if v is not None:
-        base += '%s' % v
-    if r is not None:
-        base += '-%s' % r
-    
-    return base
+    return '%s %s %s' % (name, flags[flag], version_tuple_to_string(evr))
     
 def refineSearchPattern(arg):
     """Takes a search string from the cli for Search or Provides