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

[James Antill]

 yum/__init__.py   |    5 +++++
 yum/sqlitesack.py |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 7d80461524e471b04fd8583f6388e68967010b25
Author: James Antill <james at and.org>
Date:   Tue Apr 7 17:12:32 2009 -0400

    Make sure .conf.obsoletes is off for reinstall()

diff --git a/yum/__init__.py b/yum/__init__.py
index 313d96a..a6a84b8 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3117,8 +3117,13 @@ class YumBase(depsolve.Depsolve):
                 self.verbose_logger.log(logginglevels.INFO_2, msg)
                 continue
             
+            #  Make sure obsoletes processing is off, so we can reinstall()
+            # pkgs that are obsolete.
+            old_conf_obs = self.conf.obsoletes
+            self.conf.obsoletes = False
             members = self.install(name=item.name, arch=item.arch,
                            ver=item.version, release=item.release, epoch=item.epoch)
+            self.conf.obsoletes = old_conf_obs
             if len(members) == 0:
                 self.tsInfo.remove(item.pkgtup)
                 tx_mbrs.remove(item)
commit 25be9dbf4b478ec7136b5ded3bd4f008541e1623
Author: James Antill <james at and.org>
Date:   Tue Apr 7 16:10:19 2009 -0400

    Don't blow up with weird errors on empty search lists (API only)

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 8919fbd..21c717f 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -639,7 +639,7 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
             return []
 
         result = [] # (pkg, num matches)
-        if len(fields) < 1:
+        if not fields or not searchstrings:
             return result
         
         # NOTE: I can't see any reason not to use this all the time, speed