[yum-git] Branch 'yum-3_2_X' - 2 commits -

[Seth Vidal]

 0 files changed

New commits:
commit 1803ad96d5da4ee93f35ab7d7134c2c2ef875589
Merge: 4c679a0... be409e6...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Sat Jul 19 17:37:30 2008 -0400

    Merge branch 'yum-3_2_X' of ssh://login.linux.duke.edu/home/groups/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      Don't do SQL escaping combined on each SQL field
      Make error reporting work with python-2.4.z, dito. SQL escaping.
      Tweak provides warning message to be quiet on anything with a * in it
    
    Conflicts:
    
    	yum/sqlitesack.py

commit 4c679a0ec398392bf871fa94e7e0206c05a8ba90
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Sat Jul 19 17:33:27 2008 -0400

    make yum list \*.noarch work again for repos.
    Pattern was being escaped multipled times due to for loop for the 'field' option.
    moved the escaping around to avoid that problem.

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 15e916b..11c6a36 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -1025,13 +1025,15 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
                 pat_sqls = []
                 pat_data = []
                 for pattern in patterns:
+                    if ignore_case:
+                        (pattern, esc) = self._sql_esc(pattern)
+                        pattern = pattern.replace("*", "%")
+                        pattern = pattern.replace("?", "_")
+
                     for field in ['name', 'sql_nameArch', 'sql_nameVerRelArch',
                                   'sql_nameVer', 'sql_nameVerRel',
                                   'sql_envra', 'sql_nevra']:
                         if ignore_case:
-                            (pattern, esc) = self._sql_esc(pattern)
-                            pattern = pattern.replace("*", "%")
-                            pattern = pattern.replace("?", "_")
                             pat_sqls.append("%s LIKE ?%s" % (field, esc))
                         else:
                             pat_sqls.append("%s GLOB ?" % field)