[yum-cvs] 2 commits - yum/depsolve.py yum/sqlitesack.py

[Jeremy Katz]

 yum/depsolve.py   |    7 +++----
 yum/sqlitesack.py |    6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit 0779beb6c75556c2c8770a3cb44d3f45a37d19e3
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Oct 2 17:09:17 2007 -0400

    remove duplicate code; ensure that we reset what we've seen between depsolves

diff --git a/yum/depsolve.py b/yum/depsolve.py
index 08693eb..06ddc7a 100644
--- a/yum/depsolve.py
+++ b/yum/depsolve.py
@@ -679,16 +679,15 @@ class Depsolve(object):
 
     def resolveDeps(self):
 
-        # holder object for things from the check
-        if not hasattr(self, '_dcobj'):
-            self._dcobj = DepCheck()
-
         if not len(self.tsInfo):
             return (0, ['Success - empty transaction'])
 
         # holder object for things from the check
         if not hasattr(self, '_dcobj'):
             self._dcobj = DepCheck()
+        # reset what we've seen as things may have changed between calls
+        # to resolveDeps (rh#242368, rh#308321)
+        self._dcobj.already_seen = {}
 
         CheckDeps = True
         CheckRemoves = False
commit ec2ebac74ad286a9cc9f31ec8736205004c17a3c
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Oct 2 16:37:11 2007 -0400

    don't delete non-existent attrs

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index c6877bd..9740f95 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -230,8 +230,10 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
             'provides' : { },
             'requires' : { },
             }
-        del self.pkgobjlist
-        del self.pkglist
+        if hasattr(self, 'pkgobjlist'):
+            del self.pkgobjlist
+        if hasattr(self, 'pkglist'):
+            del self.pkglist
 
         yumRepo.YumPackageSack.close(self)