[yum-commits] 3 commits - yumcommands.py yum/misc.py yum/sqlitesack.py

[James Antill]

 yum/misc.py       |    1 -
 yum/sqlitesack.py |    2 +-
 yumcommands.py    |    2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4ec4888593f739328600d42c1ad5a33d6b72674a
Author: Vratislav Podzimek <vpodzime at redhat.com>
Date:   Tue Apr 8 09:37:01 2014 -0400

    Remove extra del(fo) for weird C NULL execption (it is valid). BZ 1058297.

diff --git a/yum/misc.py b/yum/misc.py
index 347a07a..cdc08a0 100644
--- a/yum/misc.py
+++ b/yum/misc.py
@@ -360,7 +360,6 @@ def checksum(sumtype, file, CHUNK=2**16, datasize=None):
 
         if type(file) is types.StringType:
             fo.close()
-            del fo
             
         # This screws up the length, but that shouldn't matter. We only care
         # if this checksum == what we expect.
commit d70796ceab44f0ba3b71e1115f8ee8fc0249cfb2
Author: James Antill <james at and.org>
Date:   Mon Apr 7 17:16:17 2014 -0400

    Fix apkgs setup for removing packages. BZ 1019960.

diff --git a/yumcommands.py b/yumcommands.py
index c76e192..8ee2650 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -3716,7 +3716,7 @@ class RepoPkgsCommand(YumCommand):
                 # repo.
                 for txmbr in txmbrs[:]:
                     pkgs = base.pkgSack.searchNames([txmbr.name])
-                    apkgs = None
+                    apkgs = []
                     for pkg in sorted(pkgs):
                         if pkg.repoid == repoid: # Backwards filter_pkgs_repoid
                             continue
commit ebfa016877492333725eeb45b6ca9aed9f23782a
Author: James Antill <james at and.org>
Date:   Thu Mar 27 10:11:07 2014 -0400

    Fix typo, so we can find the suggests/etc. tables.

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index c11c818..16b647f 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -395,7 +395,7 @@ class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
         # Check for the new weak deps. tables...
         sql_table_exists = True
         if prcotype in ('suggests', 'enhances', 'recommends', 'supplements'):
-            cur = self._sql_MD('primary', "PRAGMA index_info(%s)" % prcotype)
+            cur = self._sql_MD('primary', "PRAGMA table_info(%s)" % prcotype)
             for ob in cur:
                 break
             else: