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

[skvidal at osuosl.org]

 yum/rpmsack.py    |    1 +
 yum/sqlitesack.py |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit ae0428bb47d0a44b1f05aaf81f763af6c8631634
Merge: 5863037... 634f4c6...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Oct 26 10:50:56 2010 -0400

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Be more defensive in dropCachedDataPostTransaction()
      Add od/ud to pkgname_ui states, so we can find things.
      l10n: Updated Swedish (sv) translation to 100%

commit 58630374093de5935d1ba5859fff4cad1bad4c5e
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Oct 26 10:24:20 2010 -0400

    whoops - catch the lookup in  _search_primary_files() too - catch them separately b/c I don't want to chase down
    any potential callers

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index f515c03..ed681fb 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -845,6 +845,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
     @catchSqliteException
     def _search_primary_files(self, name):
         querytype = 'glob'
+        name = os.path.normpath(name)
         if not misc.re_glob(name):
             querytype = '='        
         results = []
commit 912569fa40e32734eee37a95da4c321fe510d6f3
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Oct 26 10:20:21 2010 -0400

    os.path.normpath() the filename to fix rh bug: #646866
    pretty arbitrary problem but at least an easy fix

diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 6d6bf1c..cc95d96 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -375,6 +375,7 @@ class RPMDBPackageSack(PackageSackBase):
         ts = self.readOnlyTS()
         result = {}
         
+        name = os.path.normpath(name)
         mi = ts.dbMatch('basenames', name)
         for hdr in mi:
             if hdr['name'] == 'gpg-pubkey':
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index fb8333f..f515c03 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -898,6 +898,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
         glob = True
         file_glob = True
         querytype = 'glob'
+        name = os.path.normpath(name)
         dirname  = os.path.dirname(name)
         filename = os.path.basename(name)
         if strict or not misc.re_glob(name):