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

[skvidal at osuosl.org]

 yum/__init__.py |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

New commits:
commit e17a44ed2200111a17d4d6d0e9020ac40b9cb11c
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Mar 3 11:19:48 2009 -0500

    get rid of the regex entirely. Either it is 3 items or it is 1 item

diff --git a/yum/__init__.py b/yum/__init__.py
index 5f257ef..5acadca 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -2222,12 +2222,10 @@ class YumBase(depsolve.Depsolve):
         
         if depstring[0] != '/':
             # not a file dep - look at it for being versioned
-            if re.search('\s+[(>=)(<=)<=>]', depstring):  # versioned
-                try:
-                    depname, flagsymbol, depver = depstring.split()
-                except ValueError, e:
-                    raise Errors.YumBaseError, _('Invalid versioned dependency string, try quoting it.')
-                if not SYMBOLFLAGS.has_key(flagsymbol):
+            dep_split = depstring.split()
+            if len(dep_split) == 3:
+                depname, flagsymbol, depver = dep_split
+                if not flagsymbol in SYMBOLFLAGS:
                     raise Errors.YumBaseError, _('Invalid version flag')
                 depflags = SYMBOLFLAGS[flagsymbol]
                 
@@ -2265,15 +2263,13 @@ class YumBase(depsolve.Depsolve):
         
         if depstring[0] != '/':
             # not a file dep - look at it for being versioned
-            if re.search('\s+[(>=)(<=)<=>]', depstring):  # versioned
-                try:
-                    depname, flagsymbol, depver = depstring.split()
-                except ValueError:
-                    raise Errors.YumBaseError, _('Invalid versioned dependency string, try quoting it.')
-                if not SYMBOLFLAGS.has_key(flagsymbol):
+            dep_split = depstring.split()
+            if len(dep_split) == 3:
+                depname, flagsymbol, depver = dep_split
+                if not flagsymbol in SYMBOLFLAGS:
                     raise Errors.YumBaseError, _('Invalid version flag')
                 depflags = SYMBOLFLAGS[flagsymbol]
-        
+
         return self.rpmdb.getProvides(depname, depflags, depver).keys()
 
     def _bestPackageFromList(self, pkglist):