[yum-git] yum/__init__.py

Florian Festi ffesti at linux.duke.edu
Mon Feb 11 15:43:33 UTC 2008


 yum/__init__.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 47127de93c9aae69d3c1caba75aed334ef790c6b
Author: Florian Festi <ffesti at redhat.com>
Date:   Mon Feb 11 16:43:15 2008 +0100

    make _nevra_kwarg_parse a bit more forgiving when version or release is 0 (int)

diff --git a/yum/__init__.py b/yum/__init__.py
index 2438250..2b88c9c 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2471,8 +2471,14 @@ class YumBase(depsolve.Depsolve):
         returndict['arch'] = kwargs.get('arch')
         # get them as ver, version and rel, release - if someone
         # specifies one of each then that's kinda silly.
-        returndict['version'] = kwargs.get('version') or kwargs.get('ver')
-        returndict['release'] = kwargs.get('release') or kwargs.get('rel')
+        returndict['version'] = kwargs.get('version')
+        if returndict['version'] is None:
+            returndict['version'] = kwargs.get('ver')
+
+        returndict['release'] = kwargs.get('release')
+        if returndict['release'] is None:
+            returndict['release'] = kwargs.get('rel')
+
         return returndict
 
     def getKeyForPackage(self, po, askcb = None, fullaskcb = None):



More information about the Yum-cvs-commits mailing list