[yum-commits] yum/sqlitesack.py

zpavlas at osuosl.org zpavlas at osuosl.org
Mon Nov 26 10:11:00 UTC 2012


 yum/sqlitesack.py |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 6a2342875786a49e705a44de0153e1694fa0bd87
Author: Tomas Mlcoch <tmlcoch at redhat.com>
Date:   Mon Nov 26 10:25:46 2012 +0100

    Fix ugly paths after --update. BZ 835565.

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index a955895..f825b62 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -298,13 +298,14 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
                            "WHERE  packages.pkgId = ?", (self.pkgId,))
         for ob in cur:
             dirname = ob['dirname']
+            if dirname == '.':
+                dirname = ''
+            elif dirname != '/':
+                dirname += '/'
             filetypes = decodefiletypelist(ob['filetypes'])
             filenames = decodefilenamelist(ob['filenames'])
             while(filetypes):
-                if dirname:
-                    filename = dirname+'/'+filenames.pop()
-                else:
-                    filename = filenames.pop()
+                filename = dirname + filenames.pop()
                 filetype = _share_data(filetypes.pop())
                 result.setdefault(filetype,[]).append(filename)
         self._loadedfiles = True


More information about the Yum-commits mailing list