[yum-commits] yum/sqlitesack.py

[zpavlas at osuosl.org]

 yum/sqlitesack.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 630a1cef64c89246ff19dd82d2dd7502a7bbcd31
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Mon Oct 8 14:06:53 2012 +0200

    @catchSqliteException has no effect on generators.  BZ 864018
    
    _yieldSQLDataList() returns a generator object, does not run
    any SQL code.  Move the wrapper up in the call stack.

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index ed57408..7bd12c7 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -1563,7 +1563,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
             patterns = tmp
         return (need_full, patterns, fields, False)
 
-    @catchSqliteException
     def _yieldSQLDataList(self, repoid, patterns, fields, ignore_case):
         """Yields all the package data for the given params. Excludes are done
            at this stage. """
@@ -1596,6 +1595,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
                 for x in cur:
                     yield (repo, x)
 
+    @catchSqliteException
     def _buildPkgObjList(self, repoid=None, patterns=None, ignore_case=False):
         """Builds a list of packages, only containing nevra information.
            Excludes are done at this stage. """
@@ -1669,6 +1669,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
 
         return returnList
 
+    @catchSqliteException
     def simplePkgList(self, patterns=None, ignore_case=False):
         """Returns a list of pkg tuples (n, a, e, v, r), optionally from a
            single repoid. Note that the packages are always filtered to those